diff options
| author | Domen Kožar <domen@dev.si> | 2023-09-25 17:40:34 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2023-09-25 17:40:34 +0100 |
| commit | 461a549036fc552923f72973d7916a8f3b35741d (patch) | |
| tree | cf81639a0ac8ad01f8830e9e38edda5fa262226d /pkgs/development/haskell-modules | |
| parent | 4ddbdb0d9cf2237fdb79c2d1dad0abcf425f647f (diff) | |
| download | nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.gz nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.bz2 nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.lz nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.xz nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.tar.zst nixpkgs-461a549036fc552923f72973d7916a8f3b35741d.zip | |
cachix: 1.6 -> 1.6.1
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 18 |
2 files changed, 10 insertions, 18 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5aef8b2b13..1889828528d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -391,15 +391,7 @@ self: super: { # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; - cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] - # Adds a workaround to the API changes in the versions library - # Should be dropped by the next release - # https://github.com/cachix/cachix/pull/556 - (appendPatch (fetchpatch { - url = "https://github.com/cachix/cachix/commit/078d2d2212d7533a6a4db000958bfc4373c4deeb.patch"; - hash = "sha256-xfJaO2CuZWFHivq4gqbkNnTOWPiyFVjlwOPV6yibKH4="; - stripLen = 1; - }) super.cachix); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix; # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6242b5af6f4..c0e514aed8c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1070,29 +1070,29 @@ self: super: builtins.intersectAttrs super { domaindriven-core = dontCheck super.domaindriven-core; cachix-api = overrideCabal (drv: { - version = "1.6"; + version = "1.6.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.6"; - sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; + rev = "v1.6.1"; + sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; postPatch = '' - sed -i 's/1.5/1.6/' cachix-api.cabal + sed -i 's/1.6/1.6.1/' cachix-api.cabal ''; }) super.cachix-api; cachix = overrideCabal (drv: { - version = "1.6"; + version = "1.6.1"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.6"; - sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; + rev = "v1.6.1"; + sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; postPatch = '' - sed -i 's/1.5/1.6/' cachix.cabal + sed -i 's/1.6/1.6.1/' cachix.cabal ''; }) (lib.pipe (super.cachix.override { @@ -1102,7 +1102,7 @@ self: super: builtins.intersectAttrs super { [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.pkg-config) - (addBuildDepend self.ascii-progress) + (addBuildDepend self.immortal) ] ); |