colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs-bootstrap.master: 0-unstable-2024-12-14 -> 0-unstable-2024-12-15

Browse Source
This commit is contained in:
Colin
2024-12-14 22:01:21 +00:00
parent e6090045ac
commit c5a2b63162
2 changed files with 4 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -8,8 +8,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}
}:
mkNixpkgs {
rev = "5319145368e58c3483c23b78faec917fd85d6d60";
sha256 = "sha256-dXl+DCwDENnleEik6G1tlA+lQa4sWLQOePBjoY/ae0k=";
version = "0-unstable-2024-12-14";
rev = "6bbb7f091ae7fd7f3de15b6986407c74bcc1ee1b";
sha256 = "sha256-BujCf9/N4XIF2QMrXkso99U3NlNnb+8xfgreGORKG9U=";
version = "0-unstable-2024-12-15";
branch = "master";
}

68
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -31,14 +31,6 @@ in
[
./2024-10-01-python-cross-resource-usage.patch
# these patches should work, but mass rebuild w/o an urgent need for it from me
# (fetchpatch' {
# name = "alsa-ucm-conf: 1.2.11 -> 1.2.12";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/347585";
# saneCommit = "c26fe95744d672a4a2acc881e09c607fd3e3189c";
# hash = "sha256-4nzTHWmAiY9HMTu07rj0RdhlK7SWshXpkoqlKHg25do=";
# })
# merged into staging-next 2024-11-28; cherry picking causes mass rebuild.
# remove targeted patch in pipewire.nix once mainline
# (fetchpatch' {
@@ -47,30 +39,6 @@ in
# hash = "sha256-RzpQQ5452QSydPGHYRSo5r2OT08rLCz0X+g121SnlR4=";
# })
(fetchpatch' {
name = "nixos/hickory-dns: make settings.zone freeform; expose configFile option";
prUrl = "https://github.com/NixOS/nixpkgs/pull/363001";
hash = "sha256-C/Pbbd9EEuPIwgDkE/OWZeCcGercJFU8PTh3+zElbFY=";
})
# (fetchpatch' {
# name = "nixos/hickory-dns: give services.hickory-dns.settings.zone a freeformType";
# saneCommit = "d953584c1ec886b6119eb16c59e385214b5d6e0e";
# hash = "sha256-vPjK5nFcxvHpTRm0oouycEUzPBIH/muQGy8gDd5Y4Bg=";
# })
# (fetchpatch' {
# name = "nixos/hickory-dns: expose `configFile` as a toplevel option";
# saneCommit = "7cb0a6c87607810394eef050986408b0e5bd3e13";
# hash = "sha256-Gki/GZOyFcWQRfChouIEZMmg2GDdAtsUSyAbSbTqANc=";
# })
(fetchpatch' {
name = "apacheHttpdPackages.mod_dnssd: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/362066";
hash = "sha256-a7gLTrMgb2hExLcI0vHKr7N3FDWAlwkEPmbPCrj/D5w=";
})
(fetchpatch' {
# merged into staging 2024/11/28
name = "poppler: format, add dependency for glib-mkenums to fix cross building";
@@ -78,19 +46,6 @@ in
hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718=";
})
# (fetchpatch' {
# name = "nixos/buffyboard: init";
# saneCommit = "900bd0d8e6203f51c25456e493a3b61cca59ac8b";
# hash = "sha256-WKg41BWDyUo+xowYNy4bT1aN6xUSypBD77Nief7GV64=";
# })
# (fetchpatch' {
# name = "buffybox: init at 3.2.0-unstable-2024-11-10";
# saneCommit = "b5442735ff0f715f1d4ab1ca60905a721f23d98b";
# hash = "sha256-pBzW6X84QsmgXqozGRlra0ACF77rDjnw+1UjbeTBmhU=";
# })
(fetchpatch' {
name = "nixos/bonsaid: init";
prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";
@@ -105,20 +60,6 @@ in
hash = "sha256-43zxnbUJuGXThadHoQRi6cevD7SFSZejWj324V6eBpw=";
})
(fetchpatch' {
name = "procs: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/346310";
saneCommit = "b552249a1884b239337d21d4f75d4d81a2251ace";
hash = "sha256-xkT86fa0KNBE00gtIa0qqXVV6cU7SJ9X/dxPPrik+Ps=";
})
(fetchpatch' {
name = "libpeas2: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/345305";
saneGhCommit = "7062afb2ff428fa0ee8b5635ae06d5adb6fbb396";
hash = "sha256-rvJLYnmZIr1WYzcZG6gGj/5bNPBRA3Vw/RslhGFjnR4=";
})
# (fetchpatch' {
# # this causes a rebuild of systemd and everything above it:
# # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399>
@@ -129,6 +70,7 @@ in
# })
(fetchpatch' {
# merged into staging 2024-12-13
name = "python312Packages.contourpy: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/328218";
saneCommit = "74a003b0af9820f6f7c6c62b3d2bec6df3a8d7b8";
@@ -149,14 +91,6 @@ in
# hash = "sha256-cn6ihwO3MyzdpVoJoQNKAHyo8GuGvFP6vr//7r9pzjE=";
})
# (fetchpatch' {
# # branch: 2024-08-11-wip-ffado-cross / pr-ffado-cross-2
# name = "ffado: support cross compilation";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/334096";
# saneCommit = "cd316aaa667b6758d6866b356f4040343ffb6f80";
# hash = "sha256-r0jKr65dRkVU/LPfgZqNJArs2XWEudsgyYXs5bJpgj4=";
# })
# (fetchpatch' {
# # TODO: send for review once hspell fix is merged <https://github.com/NixOS/nixpkgs/pull/263182>
# # this patch works as-is, but hspell keeps a ref to build perl and thereby pollutes this closure as well.