alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #219849 from domenkozar/cachix-1.3

Browse source 
cachix: 1.2 -> 1.3
This commit is contained in:
Domen Kožar 2023-03-07 10:58:24 +04:00 committed by GitHub
parent a2393d3647 d0879528a6
commit 54b967b572
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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" ])
];

27
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -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; });