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

nixpkgs: remove upstreamed patches

Browse Source
This commit is contained in:
Colin
2025-06-07 09:22:39 +00:00
parent 3c71e2f363
commit 5acacb78fb
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,12 +36,6 @@ in
hash = "sha256-2yAXtbLOm5dOmLrLKOYwzw7drSz44akyAy9aDyKXsUI="; hash = "sha256-2yAXtbLOm5dOmLrLKOYwzw7drSz44akyAy9aDyKXsUI=";
}) })
(fetchpatch' {
name = "conky: 1.19.6 -> 1.22.1, fix cross and docs, and modernize";
prUrl = "https://github.com/NixOS/nixpkgs/pull/400497";
hash = "sha256-GWUDFtaz6LuMtIahrry8VMzQJArb9h0me5exDjkmxx8=";
})
(fetchpatch' { (fetchpatch' {
# XXX(2025-05-17): merged into staging # XXX(2025-05-17): merged into staging
name = "libmanette: fix cross compilation"; name = "libmanette: fix cross compilation";
@@ -50,13 +44,7 @@ in
}) })
(fetchpatch' { (fetchpatch' {
# XXX(2025-05-17): merged into master # XXX(2025-06-07): merged into master
name = "gnome-keyring: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/407664";
hash = "sha256-mlzlu3S9UuKCqQ+50ycC00FMp587pN5iiWc4OY0VrLE=";
})
(fetchpatch' {
name = "xarchiver: build with strictDeps=true"; name = "xarchiver: build with strictDeps=true";
prUrl = "https://github.com/NixOS/nixpkgs/pull/406599"; prUrl = "https://github.com/NixOS/nixpkgs/pull/406599";
hash = "sha256-CdNriljvuHFDCRiTu5P5BjCsyPT4gc1KzMYpisEhGcU="; hash = "sha256-CdNriljvuHFDCRiTu5P5BjCsyPT4gc1KzMYpisEhGcU=";