diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 7f3736f1f..b1dfef184 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -1,9 +1,15 @@ +# to fix sha256 (in case the updater glitches): +# - set `sha256 = "";` +# - nix-build -A hello +# => it will fail, `hash mismatch ... got: sha256:xyz` +# - nix hash to-sri sha256:xyz +# - paste the output as the new `sha256` { mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "6d78a7d119cafea7d551d4f5fb5ac6fa8145c266"; - sha256 = "sha256-qERz54AgvhH4QqLXTfM+JdQHmfHd7Blne2vWfLHwBEM="; - version = "0-unstable-2024-12-10"; + rev = "5319145368e58c3483c23b78faec917fd85d6d60"; + sha256 = "sha256-dXl+DCwDENnleEik6G1tlA+lQa4sWLQOePBjoY/ae0k="; + version = "0-unstable-2024-12-14"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index a4cba9bb3..1667e7232 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -65,13 +65,6 @@ in # hash = "sha256-Gki/GZOyFcWQRfChouIEZMmg2GDdAtsUSyAbSbTqANc="; # }) - (fetchpatch' { - name = "calls: 46.3 -> 47.0"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/363157"; - # saneCommit = "17349a94e6e7d196ae6301603d791f69f14a8a4c"; - hash = "sha256-ULm/x2st7UN0TwczXk3EertgTRkhfJbptNOIfatjLsQ="; - }) - (fetchpatch' { name = "apacheHttpdPackages.mod_dnssd: fix cross compilation"; prUrl = "https://github.com/NixOS/nixpkgs/pull/362066"; @@ -81,8 +74,8 @@ in (fetchpatch' { # merged into staging 2024/11/28 name = "poppler: format, add dependency for glib-mkenums to fix cross building"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/357344"; - hash = "sha256-3Yv6Yy1K2dNrrduM2XTEDjSmkysguTbqb8T7mDK2ubI="; + prUrl = "https://github.com/NixOS/nixpkgs/pull/357344/commits/c972c7432f8d18c9f1e5f6b52d2724c99e6d05a9"; + hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718="; })