diff options
author | sternenseemann <sternenseemann@systemli.org> | 2024-01-08 19:12:52 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2024-01-08 19:12:52 +0100 |
commit | 5a68acfd4bd1525505b6a0226293d2aa44215f46 (patch) | |
tree | 1568eafb4d1eedc763ffab961641a511403e84dc /pkgs/development/haskell-modules/configuration-nix.nix | |
parent | a2dd913a78eba74c799fe2ce6f278a5e6ad0822b (diff) | |
parent | 77e3fa92e8a6a36c3b97fb574b06de7fc7a747c8 (diff) | |
download | nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.tar nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.tar.gz nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.tar.bz2 nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.tar.lz nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.tar.xz nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.tar.zst nixlib-5a68acfd4bd1525505b6a0226293d2aa44215f46.zip |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 154ce8f0d8c0..2e0ae0eec4c9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1093,41 +1093,8 @@ self: super: builtins.intersectAttrs super { # won't work (or would need to patch test suite). domaindriven-core = dontCheck super.domaindriven-core; - cachix-api = overrideCabal (drv: { - version = "1.6.1"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.6.1"; - sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix-api"; - postPatch = '' - sed -i 's/1.6/1.6.1/' cachix-api.cabal - ''; - }) super.cachix-api; - cachix = overrideCabal (drv: { - version = "1.6.1"; - src = pkgs.fetchFromGitHub { - owner = "cachix"; - repo = "cachix"; - rev = "v1.6.1"; - sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg="; - }; - postUnpack = "sourceRoot=$sourceRoot/cachix"; - postPatch = '' - sed -i 's/1.6/1.6.1/' cachix.cabal - ''; - }) (lib.pipe - (super.cachix.override { - nix = self.hercules-ci-cnix-store.nixPackage; - }) - [ - (addBuildTool self.hercules-ci-cnix-store.nixPackage) - (addBuildTool pkgs.pkg-config) - (addBuildDepend self.immortal) - ] - ); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] + (enableSeparateBinOutput super.cachix); hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); |