nixpkgs/patches: remove redundant qemu patch, push coincurve upstream

This commit is contained in:
2025-08-26 17:02:45 +00:00
parent 023396a41e
commit 0550498cd1

View File

@@ -43,55 +43,13 @@ in
hash = "sha256-5M6+FQElYRBNmqLdDosM88yaHzS5mTVwECy2wd/fKdo=";
})
(fetchpatch' {
# 2025-08-25: required for cross compilation
name = "qemu: Fix Python deps, the third time";
prUrl = "https://github.com/NixOS/nixpkgs/pull/436516";
hash = "sha256-ZVaSlK3pgCos/96NfmKs9whYYsJroGb5xC33C0349y0=";
})
# TODO: enable, once i can tolerate a mass rebuild
# (fetchpatch' {
# # 2025-08-06: merged into staging
# name = "v4l-utils: fix cross-compilation";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/429900";
# hash = "sha256-oH9jTG38mWpjwf/LH3MTCrBm2NC4WTRPki2mUhCc5WQ=";
# })
# (fetchpatch' {
# name = "libpcap: enable dbus, rdma, bluetooth features";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/429225";
# hash = "sha256-cALgj+7eXd3H4WAmW6CIcxWRC3D4PoY2PWNsDxK+G9g=";
# })
# (fetchpatch' {
# # 2025-07-15: merged into staging
# name = "treewide: populate arch and platform for more node packages";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/422938";
# hash = "sha256-lN99K0k9dCUBFXc99XB97cZSVDu5A74pHL40vw9cobY=";
# })
# XXX(2025-07-25): master & staging have diverged that the above patch doesn't apply correctly;
# manually recreate the patches against master:
# (fetchpatch' {
# name = "nodejs: split destCPU into stdenv.$platform.node";
# saneCommit = "1fd1d40033deb51bc74ecf11b401cf2ffde5aae3";
# hash = "sha256-LGp9HzUINI5iTQ3UtggUNWS4zaYhakUI3OqM6rPiYr0=";
# })
# (fetchpatch' {
# name = "treewide: replace node platform mapping with stdenv.hostPlatform.node.{arch,platform}";
# saneCommit = "57bac5daa19c55a547f60271a7b48c59337ec12f";
# hash = "sha256-DBenl7O4KuQ1I6jmB66upufYSUdYHRkqRdqRT9stbys=";
# })
# (fetchpatch' {
# name = "buildNpmPackage: push npm_config_* options into npmHooks.npmConfigHook";
# saneCommit = "f84ef10710b6634f5bcc4c7bc4764ecfd6e8dec5";
# hash = "sha256-BHwtNvSGaqBRzUj0mP3JqAfygxjiKoX3lh4z9+B4UWk=";
# })
# (fetchpatch' {
# name = "pnpm.configHook: set npm_config_{arch,platform}";
# saneCommit = "38d2a3d80502ad63686ca886f4438d2942fbddb6";
# hash = "sha256-0grq9Os9XD+voupAQuB48WBptH5oM/qYX5iEdmuVqMQ=";
# })
(fetchpatch' {
name = "signal-desktop: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/423089";
@@ -117,10 +75,10 @@ in
})
(fetchpatch' {
# 2025-08-25: TODO: send for review after servo bitcoin is seen working
name = "coincurve: fix build";
saneCommit = "cd118a2491e613f0d4dd8673a6ac17a0094dd987";
hash = "sha256-3vIuIU7jYYcPqkm4hVPP5G4C09CSY23L8CcWNBnJ9tY=";
# saneCommit = "cd118a2491e613f0d4dd8673a6ac17a0094dd987";
prUrl = "https://github.com/NixOS/nixpkgs/pull/437180";
hash = "sha256-u/dLLLG7Keamd5sZyXnSEpXWFRnX2dITt2lNSiO3Ux8=";
})
# (fetchpatch' {