diff --git a/overlays/preferences.nix b/overlays/preferences.nix index a4387703b..0978d0f06 100644 --- a/overlays/preferences.nix +++ b/overlays/preferences.nix @@ -41,11 +41,12 @@ in # hareHook = crossHareHook; # }; - # XXX(2024-12-26): prefer pre-built electron because otherwise it takes 4 hrs to build from source. + # XXX(2024-12-26 - 2025-04-30): prefer pre-built electron because otherwise it takes 4 hrs to build from source. # but wait 2 days after staging -> master merge, and normal electron should be cached and safe to remove electron = electron-bin; electron_33 = electron_33-bin; electron_34 = electron_34-bin; + electron_35 = electron_35-bin; # evolution-data-server = super.evolution-data-server.override { # # OAuth depends on webkitgtk_4_1: old, forces an annoying recompilation diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 09007f71a..7f34e503b 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "151efeb9046efa2e3d8f83ab85aaf905d37f15fd"; - sha256 = "sha256-+CgIcpgFkGeKZ/pvkL5hqKnm7Qx7nQEg/JkHNad9ueQ="; - version = "0-unstable-2025-04-30"; + rev = "da8f0e9494ad29bd6f7d21170096b1263fd03dc4"; + sha256 = "sha256-Em1xFfFOZ+Pq3fJxYDzECLeCEqT/uld02iCWlFc62so="; + version = "0-unstable-2025-05-01"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index 0284d23ea..073577f41 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "8639599e86703017b8d651f9caedb65b0e527fda"; - sha256 = "sha256-iWY8O7rOI/7QuVVDnsBde05vvULPhfeBvoD8dz1h/TA="; - version = "0-unstable-2025-04-29"; + rev = "636429202b5a38f29a6b10d6c1dc008b95f2b5da"; + sha256 = "sha256-QuFerZhLUY6NwzU0JO2l0KuqolLVDwQ9BOlj1b/kepY="; + version = "0-unstable-2025-04-30"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index f7dd8ecfd..2ee742c46 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "947f44e54fd815159920740f59f8efb1a0f6e28c"; - sha256 = "sha256-TKJZ3TptCy4f89/wpxesMUEZ1HBTTZ1AYZT61zYYJU0="; - version = "0-unstable-2025-04-30"; + rev = "050488ac1637a57ecc5e4ef7cd9523542a554328"; + sha256 = "sha256-yJg4AKcAxH1WrX2BtG1NMitIxM1VbgVb+hD5FWrSS/o="; + version = "0-unstable-2025-05-01"; branch = "staging"; }