b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages.{cachix,hercules-ci-agent}: fix build

Browse source
This commit is contained in:
Ilan Joselevich 2023-07-09 18:00:26 +03:00
parent ca0091f00b
commit 65f90b5469
No known key found for this signature in database
2 changed files with 10 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -339,7 +339,15 @@ self: super: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
}) super.shell-conduit;
cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] super.cachix;
cachix = self.generateOptparseApplicativeCompletions [ "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
kademlia = dontCheck super.kademlia;
@ -1714,19 +1722,7 @@ self: super: {
# waiting for aeson bump
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
hercules-ci-agent = lib.pipe super.hercules-ci-agent [
(appendPatches [
# https://github.com/hercules-ci/hercules-ci-agent/pull/507
(fetchpatch {
url = "https://github.com/hercules-ci/hercules-ci-agent/commit/f5c39d0cbde36a056419cab8d69a67302eb8b0e4.patch";
sha256 = "sha256-J8N4+HUQ6vlJBCwCyxv8Fv5HSbtiim64Qh1n9CaRe1o=";
stripLen = 1;
})
# https://github.com/hercules-ci/hercules-ci-agent/pull/526
./patches/hercules-ci-agent-cachix-1.6.patch
])
(self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
];
hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent;
# Test suite doesn't compile with aeson 2.0
# https://github.com/hercules-ci/hercules-ci-agent/pull/387

32
pkgs/development/haskell-modules/patches/hercules-ci-agent-cachix-1.6.patch
View file

@ -1,32 +0,0 @@
diff --git a/hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs b/hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs
index 849d9bc..972bc90 100644
--- hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs
+++ hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs
@@ -17,6 +17,7 @@ import Hercules.Agent.Log
import Hercules.CNix.Store (StorePath)
import Hercules.Error
import qualified Hercules.Formats.CachixCache as CachixCache
+import qualified Data.Conduit as Conduit
import Protolude
push :: Text -> [StorePath] -> Int -> App ()
@@ -36,6 +37,9 @@ push cache paths workers = withNamedContext "cache" cache $ do
Cachix.Push.PushParams
{ pushParamsName = Agent.Cachix.pushCacheName pushCache,
pushParamsSecret = Agent.Cachix.pushCacheSecret pushCache,
+#if MIN_VERSION_cachix(1,6,0)
+ pushOnClosureAttempt = \_ missing -> return missing,
+#endif
pushParamsStore = nixStore,
pushParamsClientEnv = clientEnv,
pushParamsStrategy = \storePath ->
@@ -59,6 +63,9 @@ push cache paths workers = withNamedContext "cache" cache $ do
compressionLevel = 2,
#else
withXzipCompressor = Cachix.Push.defaultWithXzipCompressor,
+#endif
+#if MIN_VERSION_cachix(1,6,0)
+ onUncompressedNARStream = \_ _ -> Conduit.awaitForever Conduit.yield,
#endif
omitDeriver = False
}