diff options
author | Domen Kožar <domen@dev.si> | 2023-04-06 19:35:39 +0100 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2023-04-06 19:35:39 +0100 |
commit | 0373758bed87bd3efa870336111afdf504dff928 (patch) | |
tree | f06373a29828275dba2ba979a3fec1d1bdcbb218 /pkgs/development/haskell-modules | |
parent | 70aea98451bab841aa4a676542e351743cd62209 (diff) | |
download | nixpkgs-0373758bed87bd3efa870336111afdf504dff928.tar nixpkgs-0373758bed87bd3efa870336111afdf504dff928.tar.gz nixpkgs-0373758bed87bd3efa870336111afdf504dff928.tar.bz2 nixpkgs-0373758bed87bd3efa870336111afdf504dff928.tar.lz nixpkgs-0373758bed87bd3efa870336111afdf504dff928.tar.xz nixpkgs-0373758bed87bd3efa870336111afdf504dff928.tar.zst nixpkgs-0373758bed87bd3efa870336111afdf504dff928.zip |
cachix: 1.4.1 -> 1.4.2
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0cd51075f9a..276b725fe4c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -971,10 +971,23 @@ self: super: builtins.intersectAttrs super { # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; - cachix = super.cachix.override { + cachix = overrideCabal (drv: { + version = "1.4.2"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.4.2"; + sha256 = "sha256-EjBM5O+wXJhthRU/Nd9VFe7x5O93nx0pMt3jx0Ow="; + }; + postUnpack = "sourceRoot=$sourceRoot/cachix"; + postPatch = '' + sed -i 's/1.4.1/1.4.2/' cachix.cabal + ''; + }) (super.cachix.override { fsnotify = dontCheck super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; - }; + }); + cachix_1_3_3 = super.cachix_1_3_3.override { nix = self.hercules-ci-cnix-store.nixPackage; fsnotify = dontCheck super.fsnotify_0_4_1_0; |