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

cross: snapper: push patches upstream

Browse Source
This commit is contained in:
Colin 2023-10-24 17:01:08 +00:00
parent fc84aa88ee
commit e2d72f9e54
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixpatches/list.nix
View File

@ -52,6 +52,11 @@ in [
prUrl = "https://github.com/NixOS/nixpkgs/pull/263182";
hash = "sha256-Wau+PB+EUQDvWX8Kycw1sNrM3GkPVjKSS4niIDI0sjM=";
})
(fetchpatch' {
title = "snapper: remove runtime references to build packages";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263187";
hash = "sha256-+NJtox6BsoQwpO6DxehrA4l/eWf/vgGN7EopCt4ZIFk=";
})
(fetchpatch' {
title = "trust-dns: 0.23.0 -> 0.24.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263054";

20
overlays/cross.nix
View File

@ -1800,16 +1800,16 @@ in {
# inherit (emulated) stdenv;
# };
# 2023/10/23: upstreaming is unblocked
snapper = prev.snapper.overrideAttrs (upstream: {
# replace references to build diff/rm to runtime diff/rm
# also reduces closure 305628736 -> 262698112
configureFlags = (upstream.configureFlags or []) ++ [
"DIFFBIN=${final.diffutils}/bin/diff"
"RMBIN=${final.coreutils}/bin/rm"
];
# strictDeps = true; #< doesn't actually prevent original symptom
});
# 2023/10/23: upstreaming: <https://github.com/NixOS/nixpkgs/pull/263187>
# snapper = prev.snapper.overrideAttrs (upstream: {
# # replace references to build diff/rm to runtime diff/rm
# # also reduces closure 305628736 -> 262698112
# configureFlags = (upstream.configureFlags or []) ++ [
# "DIFFBIN=${final.diffutils}/bin/diff"
# "RMBIN=${final.coreutils}/bin/rm"
# ];
# # strictDeps = true; #< doesn't actually prevent original symptom
# });
spandsp = prev.spandsp.overrideAttrs (upstream: {
configureFlags = upstream.configureFlags or [] ++ [