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

Merge pull request #115256 from NixOS/haskell-updates

Browse Source 
Update Haskell package set to Stackage Nightly 2021-03-06 (plus other fixes)
This commit is contained in:
Peter Simons
2021-03-12 20:53:42 +01:00
committed by GitHub
parent 7ba904b85e 5966fa1845
commit 795ef4f46f
12 changed files with 1665 additions and 1340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/continuous-integration/hci/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
let
inherit (haskell.lib) overrideCabal addBuildDepends;
inherit (lib) makeBinPath;
bundledBins = lib.optional stdenv.isLinux runc;
pkg =
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
overrideCabal
(addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ])
(o: {
postInstall = ''
${o.postInstall or ""}
mkdir -p $out/libexec
mv $out/bin/hci $out/libexec
makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins}
'';
});
in pkg // {
meta = pkg.meta // {
position = toString ./default.nix + ":1";
};
}
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
+4 -2
View File
@@ -1,7 +1,9 @@
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }:
{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:
let
inherit (haskell.lib) overrideCabal addBuildDepends;
inherit (lib) makeBinPath;
bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc;
pkg =
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
overrideCabal
@@ -11,7 +13,7 @@ let
${o.postInstall or ""}
mkdir -p $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 // {