public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hercules-ci-agent: Fix and update build

Browse Source
This commit is contained in:
Robert Hensing 2021-03-07 13:39:06 +01:00
parent 58221bd446
commit c0a3fd18ca
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1518,8 +1518,20 @@ self: super: {
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger; servant-swagger = dontCheck super.servant-swagger;
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0 hercules-ci-agent = super.hercules-ci-agent.override {
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; cachix =
# https://github.com/cachix/cachix/pull/361
(appendPatch
(addBuildDepend super.cachix super.hercules-ci-cnix-store)
(pkgs.fetchpatch {
name = "cachix-361.patch";
url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
stripLen = 1;
includes = ["*.cabal" "*.hs"];
})
);
};
# 2020-12-05: http-client is fixed on too old version # 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {

6
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
View File

@ -1,7 +1,9 @@
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }: { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
let let
inherit (haskell.lib) overrideCabal addBuildDepends; inherit (haskell.lib) overrideCabal addBuildDepends;
inherit (lib) makeBinPath; inherit (lib) makeBinPath;
bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
pkg = pkg =
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
overrideCabal overrideCabal
@ -11,7 +13,7 @@ let
${o.postInstall or ""} ${o.postInstall or ""}
mkdir -p $out/libexec mkdir -p $out/libexec
mv $out/bin/hercules-ci-agent $out/libexec mv $out/bin/hercules-ci-agent $out/libexec
makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]} makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins}
''; '';
}); });
in pkg // { in pkg // {