diff options
| author | Domen Kožar <domen@dev.si> | 2023-03-07 10:58:24 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 10:58:24 +0400 |
| commit | 54b967b5724b87233363c647fddd53088a58b7de (patch) | |
| tree | bf7be4cfd831518db43fe1992dd4ea2c1cdb9e6a | |
| parent | a2393d36477d114086e078a333850eda87ed6097 (diff) | |
| parent | d0879528a63d927b4d571ed9242b8ab9b7f2fda8 (diff) | |
Merge pull request #219849 from domenkozar/cachix-1.3
cachix: 1.2 -> 1.3
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 27 |
2 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b52ea1afc10..4884fa55cb97 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1574,6 +1574,12 @@ self: super: { servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; hercules-ci-agent = lib.pipe super.hercules-ci-agent [ + (appendPatch (fetchpatch { + name = "hercules-ci-agent-support-cachix-1.3.patch"; + url = "https://github.com/hercules-ci/hercules-ci-agent/pull/500.diff"; + sha256 = "sha256-ErrFvzB1NiIJLpsP2wfx5CX8DnH1x5i/ijQZEeuOzeI="; + relative = "hercules-ci-agent"; + })) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c38cd8ee4968..92dd0d665d9b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -878,11 +878,34 @@ 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.3"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.3"; + sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q="; + }; + buildDepends = [ self.conduit-concurrent-map ]; + postUnpack = "sourceRoot=$sourceRoot/cachix"; + postPatch = '' + sed -i 's/1.2/1.3/' cachix.cabal + ''; + }) (super.cachix.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; fsnotify = dontCheck super.fsnotify_0_4_1_0; hnix-store-core = super.hnix-store-core_0_6_1_0; - }; + }); + cachix-api = overrideCabal (drv: { + version = "1.3"; + src = pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "v1.3"; + sha256 = "sha256-y0CqfFIWd2nl1o2XvskHfaQRg8qqRZf16BYLAqJ+Q2Q="; + }; + postUnpack = "sourceRoot=$sourceRoot/cachix-api"; + }) super.cachix-api; 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; }); |