From da212233d6d39ae80e5f48af9a32cae749578527 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Tue, 16 Apr 2024 10:06:15 +0200 Subject: [PATCH] Update flakes, remove electron workaround --- flake.lock | 112 ++++++++++++++++++++++++++--------------------------- flake.nix | 46 ++-------------------- 2 files changed, 59 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index f0e6b20..524f972 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1712786091, - "narHash": "sha256-YK84WXkrqs0/uVoXb8x3+xx1P1dn/IoO+DwD6P/+7n0=", + "lastModified": 1713020398, + "narHash": "sha256-fZ9snNCxKj5sJ/hymCW8aM8Lzlbzo/VYYfl/oNLh/jc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0d1cb79bc1fdae025f557f6c5053c69b35f4cc35", + "rev": "f0e16565b38a473664977625680f08e7cc9dec50", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1712690805, - "narHash": "sha256-5/gL5CM1MeuHh3zoSyt07lhJTb5GBGRTIGFqONyJl9g=", + "lastModified": 1712765734, + "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "6345742e8b83a528353beb0fbb0e5b54aa39191d", + "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1712798444, - "narHash": "sha256-aAksVB7zMfBQTz0q2Lw3o78HM3Bg2FRziX2D6qnh+sk=", + "lastModified": 1713152224, + "narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=", "owner": "nix-community", "repo": "disko", - "rev": "a297cb1cb0337ee10a7a0f9517954501d8f6f74d", + "rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1712800011, - "narHash": "sha256-mEL4y1N/aQrI+OeYHm6Sol8lpDVsceCc2TJF8+uMv6Y=", + "lastModified": 1713154103, + "narHash": "sha256-7tpbjpUI7YDpxP0ciM9bWBxzAT3jsZP9l8EGWFQVBmU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9b79fd139ff55062e46191bd5dd42fcb79696328", + "rev": "1b01966ee01008bcec18702ea5e543b93236ecef", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1712759992, - "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1712521891, - "narHash": "sha256-qJRkB7QZo2mdR/nABeHQKi3xkQxUsSGjVVQXTSHQocI=", + "lastModified": 1712909442, + "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ec53086c76303dc8880fa7ba06c45abcae8b3398", + "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712679520, - "narHash": "sha256-TQ9Y4wQV+wIuMBGkwbkDey+mcfdHH+ix7ccepzFQBNc=", + "lastModified": 1712983637, + "narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=", "owner": "martinvonz", "repo": "jj", - "rev": "580a90b6944f3a658e5bdea8d6f43afebd91eda7", + "rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d", "type": "github" }, "original": { @@ -614,11 +614,11 @@ ] }, "locked": { - "lastModified": 1712736594, - "narHash": "sha256-r9i9cZUB02l0qhJ7Q4g3zXM8uClM4zxjEYM1AAFq48I=", + "lastModified": 1712992043, + "narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=", "owner": "YaLTeR", "repo": "niri", - "rev": "0cd149c939c1f756a96381a84801073021ac1e63", + "rev": "71be19b234d58f4ec447e921633506beb81a52c0", "type": "github" }, "original": { @@ -640,11 +640,11 @@ ] }, "locked": { - "lastModified": 1710495228, - "narHash": "sha256-w0XM85Zo4mNqRLZDZMWUw0wv7LRoODKohCWIaVNnE94=", + "lastModified": 1713164845, + "narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "75c0c2d5eb1fdd2c5187c49888cab40b060605fa", + "rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710120787, - "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=", + "lastModified": 1713067146, + "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07", + "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", "type": "github" }, "original": { @@ -731,11 +731,11 @@ ] }, "locked": { - "lastModified": 1712459390, - "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", + "lastModified": 1713067146, + "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "4676d72d872459e1e3a248d049609f110c570e9a", + "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", "type": "github" }, "original": { @@ -751,11 +751,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1712668238, - "narHash": "sha256-99MkjQdZlEJ4292bUtHx7C07pDSbU9syEb3lc+FrPkw=", + "lastModified": 1713026309, + "narHash": "sha256-345jReT2AFR6VK0KYAEmIjsMvlCCFsoT0Xaku6Nw1fQ=", "owner": "nix-community", "repo": "nix-ld-rs", - "rev": "f1c82bda746815f2162a9cc959296bfa0fc50499", + "rev": "6b76b4aa158819d6bce637485c4cdd710517c6ce", "type": "github" }, "original": { @@ -806,12 +806,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", - "revCount": 609462, + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "revCount": 610435, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.609462%2Brev-4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6/018ec465-ecc0-7383-ad59-bf84009e7b07/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.610435%2Brev-1042fd8b148a9105f3c0aca3a6177fd1d9360ba5/018ed02d-7ab0-7d1c-9ebe-c075011335be/source.tar.gz" }, "original": { "type": "tarball", @@ -870,11 +870,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712757991, - "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", + "lastModified": 1713128889, + "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", + "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa", "type": "github" }, "original": { @@ -886,11 +886,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ }, "nur": { "locked": { - "lastModified": 1712832312, - "narHash": "sha256-cCbPmeF4BZGfXqshK0X3h8ldwrOFQO0NNpmYXQVvRoY=", + "lastModified": 1713168497, + "narHash": "sha256-iXL7OzgVXCWyiWpdxGQgQ36zLwmassPWk23bd+ukY8M=", "owner": "nix-community", "repo": "NUR", - "rev": "a82af85f3b1d080245a9d4f7d8d03b8ee424236e", + "rev": "176d335eaf1562de6dad71af2e850b2897c7a69e", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1712484920, - "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=", + "lastModified": 1713085647, + "narHash": "sha256-UkY2rK6f5OgwH2pvRQwm9QeueC5C37Nzm+R2/iNjHtU=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3", + "rev": "5af3d8f504d1d63aef73eda65c7a946c3fe3ac7a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a974e63..31f57da 100644 --- a/flake.nix +++ b/flake.nix @@ -82,54 +82,14 @@ inputs.nix-alien.overlays.default inputs.nix-ld-rs.overlays.default ]; - electronWorkaround = pkgs: rec { - electron_28 = pkgs.electron_28.overrideAttrs - (oldAttrs: rec { - - buildCommand = - let - electron-unwrapped = pkgs.electron_28.passthru.unwrapped.overrideAttrs (oldAttrs: rec { - postPatch = builtins.replaceStrings [ "--exclude='src/third_party/blink/web_tests/*'" ] [ "--exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*'" ] oldAttrs.postPatch; - }); - in - '' - gappsWrapperArgsHook - mkdir -p $out/bin - makeWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ - "''${gappsWrapperArgs[@]}" \ - --set CHROME_DEVEL_SANDBOX $out/libexec/electron/chrome-sandbox - - ln -s ${electron-unwrapped}/libexec $out/libexec - ''; - }); - electron = pkgs.electron.overrideAttrs - (oldAttrs: rec { - buildCommand = - let - electron-unwrapped = pkgs.electron.passthru.unwrapped.overrideAttrs (oldAttrs: rec { - postPatch = builtins.replaceStrings [ "--exclude='src/third_party/blink/web_tests/*'" ] [ "--exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*'" ] oldAttrs.postPatch; - }); - in - '' - gappsWrapperArgsHook - mkdir -p $out/bin - makeWrapper "${electron-unwrapped}/libexec/electron/electron" "$out/bin/electron" \ - "''${gappsWrapperArgs[@]}" \ - --set CHROME_DEVEL_SANDBOX $out/libexec/electron/chrome-sandbox - - ln -s ${electron-unwrapped}/libexec $out/libexec - ''; - }); - }; pkgs-args = { inherit system overlays; config = { allowUnfree = true; - packageOverrides = electronWorkaround; permittedInsecurePackages = [ - "electron-22.3.27" - "electron-24.8.6" - "electron-25.9.0" + # "electron-22.3.27" + # "electron-24.8.6" + # "electron-25.9.0" ]; }; };