talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #257291 from domenkozar/cachix-1.6.1

Browse Source 
cachix: 1.6 -> 1.6.1
This commit is contained in:
Domen Kožar
2023-09-25 20:14:26 +01:00
committed by GitHub
parent 2cd3ae1994 461a549036
commit 7e5e43ef91
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,15 +391,7 @@ self: super: {
# https://github.com/awakesecurity/nix-graph/issues/5 # https://github.com/awakesecurity/nix-graph/issues/5
nix-graph = doJailbreak super.nix-graph; nix-graph = doJailbreak super.nix-graph;
cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix;
# Adds a workaround to the API changes in the versions library
# Should be dropped by the next release
# https://github.com/cachix/cachix/pull/556
(appendPatch (fetchpatch {
url = "https://github.com/cachix/cachix/commit/078d2d2212d7533a6a4db000958bfc4373c4deeb.patch";
hash = "sha256-xfJaO2CuZWFHivq4gqbkNnTOWPiyFVjlwOPV6yibKH4=";
stripLen = 1;
}) super.cachix);
# https://github.com/froozen/kademlia/issues/2 # https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia; kademlia = dontCheck super.kademlia;

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

@@ -1070,29 +1070,29 @@ self: super: builtins.intersectAttrs super {
domaindriven-core = dontCheck super.domaindriven-core; domaindriven-core = dontCheck super.domaindriven-core;
cachix-api = overrideCabal (drv: { cachix-api = overrideCabal (drv: {
version = "1.6"; version = "1.6.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "cachix"; owner = "cachix";
repo = "cachix"; repo = "cachix";
rev = "v1.6"; rev = "v1.6.1";
sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";
}; };
postUnpack = "sourceRoot=$sourceRoot/cachix-api"; postUnpack = "sourceRoot=$sourceRoot/cachix-api";
postPatch = '' postPatch = ''
sed -i 's/1.5/1.6/' cachix-api.cabal sed -i 's/1.6/1.6.1/' cachix-api.cabal
''; '';
}) super.cachix-api; }) super.cachix-api;
cachix = overrideCabal (drv: { cachix = overrideCabal (drv: {
version = "1.6"; version = "1.6.1";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "cachix"; owner = "cachix";
repo = "cachix"; repo = "cachix";
rev = "v1.6"; rev = "v1.6.1";
sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; sha256 = "sha256-6S8EOs7bGTyY4eDXGuTbJMTlaz0n1JYIAPKIB2cVYxg=";
}; };
postUnpack = "sourceRoot=$sourceRoot/cachix"; postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = '' postPatch = ''
sed -i 's/1.5/1.6/' cachix.cabal sed -i 's/1.6/1.6.1/' cachix.cabal
''; '';
}) (lib.pipe }) (lib.pipe
(super.cachix.override { (super.cachix.override {
@@ -1102,7 +1102,7 @@ self: super: builtins.intersectAttrs super {
[ [
(addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool self.hercules-ci-cnix-store.nixPackage)
(addBuildTool pkgs.pkg-config) (addBuildTool pkgs.pkg-config)
(addBuildDepend self.ascii-progress) (addBuildDepend self.immortal)
] ]
); );