nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-19 22:30:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cachix: remove no longer needed src override & patch

Browse Source 
The patch and overrides removed in this change were only needed
temporarly to avoid waiting for a haskell-updates cycle.
This commit is contained in:
Ilan Joselevich
2023-03-13 20:32:49 +02:00
parent df547d23fb
commit 6e99f2eecc
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1565,12 +1565,6 @@ 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,34 +878,11 @@ 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.3.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.3.1";
sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";
};
buildDepends = [ self.conduit-concurrent-map ];
postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = ''
sed -i 's/1.3/1.3.1/' cachix.cabal
'';
}) (super.cachix.override {
cachix = 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.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.3.1";
sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";
};
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; });