nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-25.05] cachix: 1.7.9 -> 1.9.1 (#454831)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-10-23 10:10:45 +00:00
committed by GitHub
parent c6a5e8d245 f1d47ca7fa
commit 95ec937f47
1 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,42 +565,6 @@ self: super:
# https://github.com/illia-shkroba/pfile/issues/2
pfile = doJailbreak super.pfile;
# Manually maintained
cachix-api = overrideCabal (drv: {
version = "1.7.9";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
tag = "v1.7.9";
hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
}) super.cachix-api;
cachix = (
overrideCabal
(drv: {
version = "1.7.9";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
tag = "v1.7.9";
hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
};
postUnpack = "sourceRoot=$sourceRoot/cachix";
})
(
lib.pipe
(super.cachix.override {
nix = self.hercules-ci-cnix-store.nixPackage;
})
[
(addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.buildPackages.pkg-config)
(addBuildDepend self.hnix-store-nar)
]
)
);
# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
@@ -3370,3 +3334,40 @@ self: super:
setAmazonkaSourceRoot "lib/amazonka" (doJailbreak super.amazonka);
}
)
# Cachix packages
# Manually maintained
// (
let
version = "1.9.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
tag = "v${version}";
hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=";
};
in
{
cachix-api = overrideSrc {
inherit version;
src = src + "/cachix-api";
} super.cachix-api;
cachix = lib.pipe super.cachix [
(overrideSrc {
inherit version;
src = src + "/cachix";
})
(addBuildDepends [
self.pqueue
])
(
drv:
drv.override {
nix = self.hercules-ci-cnix-store.nixPackage;
}
)
];
}
)