diff options
author | Ellie Hermaszewska <git@monoid.al> | 2021-10-26 18:20:34 +0800 |
---|---|---|
committer | Ellie Hermaszewska <git@monoid.al> | 2021-11-07 20:18:45 +0800 |
commit | 15ae25f36ce057c1750f02e30bcd7b6dc38d523b (patch) | |
tree | b185f546a252ee953c0902803bb9fd8a692b33c7 /pkgs/development/tools/continuous-integration | |
parent | 518f09f2d0e8829c3ef77c0f535df309f49ed6d9 (diff) | |
download | nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.gz nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.bz2 nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.lz nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.xz nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.zst nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.zip |
haskell: switch from haskell.lib to haskell.lib.compose
Diffstat (limited to 'pkgs/development/tools/continuous-integration')
-rw-r--r-- | pkgs/development/tools/continuous-integration/hci/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index dfca0c4d388..5c0c59845ce 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,13 +1,12 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; 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 ""} @@ -15,7 +14,8 @@ let mv $out/bin/hci $out/libexec makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins} ''; - }); + }) + (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index bc464c2024e..00ae501e534 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,13 +1,12 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; 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 - (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-agent) [ makeWrapper ]) (o: { postInstall = '' ${o.postInstall or ""} @@ -15,7 +14,8 @@ let mv $out/bin/hercules-ci-agent $out/libexec makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins} ''; - }); + }) + (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1"; |