From 2cd55b31f5d4eca64d8c24128ca643e4c0b2a71b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 12 Oct 2022 02:19:05 +0200 Subject: [PATCH 1/2] hci: Fix cross eval --- pkgs/development/tools/continuous-integration/hci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 0919a6ec58b1..5060d0aeda01 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,6 +1,6 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; From 186294a934cfc0ab266c48b98a6c18b4c184850b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 12 Oct 2022 02:19:24 +0200 Subject: [PATCH 2/2] hercules-ci-agent: Fix cross eval --- .../continuous-integration/hercules-ci-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ec1e6fb93b2e..b4a783765df9 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,6 +1,6 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1";