From dd7d99efa9cbc19260910a288708f683385c9f86 Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 21 Oct 2025 13:25:33 +0200 Subject: [PATCH] cachix: 1.7.9 -> 1.9.1 --- .../haskell-modules/configuration-common.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0587161a6a68..b42dbb5a4b33 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -4034,16 +4034,17 @@ with haskellLib; } ) -# cachix: manually maintained +# Cachix packages +# Manually maintained // ( let - version = "1.7.9"; + version = "1.9.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; tag = "v${version}"; - hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A="; + hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc="; }; in { @@ -4057,12 +4058,9 @@ with haskellLib; inherit version; src = src + "/cachix"; }) - # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704 - (overrideCabal (_: { - postPatch = '' - sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs - ''; - })) + (addBuildDepends [ + self.pqueue + ]) ( drv: drv.override {