From 6a08bcf1d5a58a528b1b9a00c99ed7a49fc2fbef Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Dec 2022 01:32:07 +0100 Subject: haskell-modules/configuration-common.nix: Bring fetchpatch2 into scope --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8267a47ff7e90..f3347f681e45d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -12,7 +12,7 @@ { pkgs, haskellLib }: let - inherit (pkgs) fetchpatch lib; + inherit (pkgs) fetchpatch fetchpatch2 lib; inherit (lib) throwIfNot versionOlder; in -- cgit 1.4.1 From 50da22497914903fd0b01ff247fe59556bd5aefc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 20 Dec 2022 01:32:39 +0100 Subject: hercules-ci-agent: Patch for cachix 1.1 --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f3347f681e45d..21da355e546f8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1733,6 +1733,14 @@ self: super: { sha256 = "sha256-0dtmNL1rqzeXvXWinfANc57a5LIM3uNnhR3A+p8mH0A="; stripLen = 1; }) + # haskell-updates branch, will be merged in 0.9.10 + (fetchpatch2 { + name = "hercules-ci-agent-cachix-1.1"; + url = "https://github.com/hercules-ci/hercules-ci-agent/commit/b76d888548da37a96ae47f1be871de6605d38edd.patch"; + sha256 = "sha256-kqEkDHbatcYS8LuQlGV/1j/6LXWviQoDQAHDr6DBbDU="; + stripLen = 1; + includes = [ "*.hs" ]; + }) ]) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; -- cgit 1.4.1