Skip to content

Commit 29e4738

Browse files
strace: make module obsolete with version 7.0, drop support for 6.3 (#376)
1 parent 6939ba6 commit 29e4738

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

modules/strace.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ in
1313
config = lib.mkIf cfg.withColors {
1414
environment.systemPackages = [
1515
(pkgs.strace.overrideAttrs ({ patches ? [ ], version, ... }: {
16-
patches = patches ++ [
16+
# TODO: drop module with 26.05
17+
patches = patches ++ lib.optionals (lib.versionOlder version "7.0") [
1718
(let
18-
patchVersion = if lib.versionAtLeast version "6.16" then "6.16" else "6.3";
19+
patchVersion = "6.16";
1920
in pkgs.fetchpatch {
2021
url = "https://github.com/xfgusta/strace-with-colors/raw/v${patchVersion}-1/strace-with-colors.patch";
21-
name = "strace-with-colors-${version}.patch";
22-
hash = {
23-
"6.16" = "sha256-Uw4lOKuEwT6kTwLZYuTqlq64wBHDt5kL5JwV7hdiBNg=";
24-
"6.3" = "sha256-gcQldGsRgvGnrDX0zqcLTpEpchNEbCUFdKyii0wetEI=";
25-
}.${patchVersion} or (throw "nixos-modules.strace: does not know a patch for strace version ${version}");
22+
name = "strace-with-colors-${patchVersion}.patch";
23+
hash = "sha256-Uw4lOKuEwT6kTwLZYuTqlq64wBHDt5kL5JwV7hdiBNg=";
2624
})
2725
];
2826
}))

0 commit comments

Comments
 (0)