colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cachix: 1.4.2 -> 1.5

Browse Source
This commit is contained in:
Domen Kožar 2023-05-17 18:32:51 +01:00
parent 2515b0e0dc
commit ca831aeb74
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1717,9 +1717,6 @@ self: super: {
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
hercules-ci-agent = lib.pipe super.hercules-ci-agent [
(pkg: pkg.override (_: {
cachix = super.cachix_1_3_3;
}))
(self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
];

47
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -994,30 +994,43 @@ self: super: builtins.intersectAttrs super {
# won't work (or would need to patch test suite).
domaindriven-core = dontCheck super.domaindriven-core;
cachix = overrideCabal (drv: {
version = "1.4.2";
cachix-api = overrideCabal (drv: {
version = "1.5";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.4.2";
sha256 = "sha256-EjfBM5O+wXJhthRU/Nd9VFue7xo5O93nx0pMt3jx0Ow=";
rev = "v1.5";
sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
postPatch = ''
sed -i 's/1.4.2/1.5/' cachix-api.cabal
'';
}) super.cachix-api;
cachix = overrideCabal (drv: {
version = "1.5";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.5";
sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = ''
sed -i 's/1.4.1/1.4.2/' cachix.cabal
sed -i 's/1.4.2/1.5/' 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 = overrideCabal (drv: {
hydraPlatforms = pkgs.lib.platforms.all;
}) (super.cachix_1_3_3.override {
nix = self.hercules-ci-cnix-store.nixPackage;
fsnotify = dontCheck super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
});
}) (lib.pipe
(super.cachix.override {
fsnotify = dontCheck super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
})
[
(addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.pkg-config)
(addBuildDepend self.inline-c-cpp)
(addBuildDepend self.hercules-ci-cnix-store)
]
);
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; });

2
pkgs/top-level/all-packages.nix
View File

@ -19744,7 +19744,7 @@ with pkgs;
c-blosc = callPackage ../development/libraries/c-blosc { };
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix_1_3_3;
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
calcium = callPackage ../development/libraries/calcium { };