From 7f95ff0a9af4c54644446788239cb8350d1b4b6a Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sat, 27 Jan 2024 09:01:00 -0300 Subject: [PATCH] fix(nix): improve generated derivations (#4582) - use stdenvNoCC instead of pkgs.stdenvNoCC - always include stdenvNoCC, even if no deps - use stdenvNoCC.is(Darwin/Linux) instead of stdenv's refs #4358 refs 003a8815 Signed-off-by: Carlos Alexandro Becker --- internal/pipe/nix/nix.go | 4 ++-- .../testdata/TestBinInstallFormats/darwin-only-deps.golden | 2 +- .../testdata/TestBinInstallFormats/linux-only-deps.golden | 2 +- .../nix/testdata/TestBinInstallFormats/mixed-deps.golden | 2 +- internal/pipe/nix/testdata/TestRunPipe/deps_build.nix.golden | 5 ++--- .../pipe/nix/testdata/TestRunPipe/deps_publish.nix.golden | 5 ++--- .../nix/testdata/TestRunPipe/extra-install_build.nix.golden | 5 ++--- .../testdata/TestRunPipe/extra-install_publish.nix.golden | 5 ++--- .../pipe/nix/testdata/TestRunPipe/minimal_build.nix.golden | 4 ++-- .../pipe/nix/testdata/TestRunPipe/minimal_publish.nix.golden | 4 ++-- .../pipe/nix/testdata/TestRunPipe/open-pr_build.nix.golden | 4 ++-- .../pipe/nix/testdata/TestRunPipe/open-pr_publish.nix.golden | 4 ++-- .../pipe/nix/testdata/TestRunPipe/partial_build.nix.golden | 4 ++-- .../pipe/nix/testdata/TestRunPipe/partial_publish.nix.golden | 4 ++-- .../testdata/TestRunPipe/skip-upload-auto_build.nix.golden | 4 ++-- .../nix/testdata/TestRunPipe/skip-upload_build.nix.golden | 4 ++-- .../testdata/TestRunPipe/unibin-replaces_build.nix.golden | 4 ++-- .../testdata/TestRunPipe/unibin-replaces_publish.nix.golden | 4 ++-- .../nix/testdata/TestRunPipe/wrapped-in-dir_build.nix.golden | 4 ++-- .../testdata/TestRunPipe/wrapped-in-dir_publish.nix.golden | 4 ++-- .../nix/testdata/TestRunPipe/zip-and-tar_build.nix.golden | 3 +-- .../nix/testdata/TestRunPipe/zip-and-tar_publish.nix.golden | 3 +-- .../TestRunPipe/zip-with-dependencies_build.nix.golden | 3 +-- .../TestRunPipe/zip-with-dependencies_publish.nix.golden | 3 +-- internal/pipe/nix/testdata/TestRunPipe/zip_build.nix.golden | 3 +-- .../pipe/nix/testdata/TestRunPipe/zip_publish.nix.golden | 3 +-- internal/pipe/nix/tmpl.nix | 5 ++--- 27 files changed, 45 insertions(+), 56 deletions(-) diff --git a/internal/pipe/nix/nix.go b/internal/pipe/nix/nix.go index 403cd2696..1e1976446 100644 --- a/internal/pipe/nix/nix.go +++ b/internal/pipe/nix/nix.go @@ -503,10 +503,10 @@ func binInstallFormats(nix config.Nix) []string { var depStrings []string if len(darwinDeps) > 0 { - depStrings = append(depStrings, fmt.Sprintf("lib.optionals stdenv.isDarwin [ %s ]", strings.Join(darwinDeps, " "))) + depStrings = append(depStrings, fmt.Sprintf("lib.optionals stdenvNoCC.isDarwin [ %s ]", strings.Join(darwinDeps, " "))) } if len(linuxDeps) > 0 { - depStrings = append(depStrings, fmt.Sprintf("lib.optionals stdenv.isLinux [ %s ]", strings.Join(linuxDeps, " "))) + depStrings = append(depStrings, fmt.Sprintf("lib.optionals stdenvNoCC.isLinux [ %s ]", strings.Join(linuxDeps, " "))) } if len(deps) > 0 { depStrings = append(depStrings, fmt.Sprintf("[ %s ]", strings.Join(deps, " "))) diff --git a/internal/pipe/nix/testdata/TestBinInstallFormats/darwin-only-deps.golden b/internal/pipe/nix/testdata/TestBinInstallFormats/darwin-only-deps.golden index 1a618b641..f4b14d8d2 100644 --- a/internal/pipe/nix/testdata/TestBinInstallFormats/darwin-only-deps.golden +++ b/internal/pipe/nix/testdata/TestBinInstallFormats/darwin-only-deps.golden @@ -1,2 +1,2 @@ cp -vr ./%[1]s $out/bin/%[1]s -wrapProgram $out/bin/%[1]s --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isDarwin [ foo bar ])} \ No newline at end of file +wrapProgram $out/bin/%[1]s --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isDarwin [ foo bar ])} \ No newline at end of file diff --git a/internal/pipe/nix/testdata/TestBinInstallFormats/linux-only-deps.golden b/internal/pipe/nix/testdata/TestBinInstallFormats/linux-only-deps.golden index 1447b8bc0..6da178490 100644 --- a/internal/pipe/nix/testdata/TestBinInstallFormats/linux-only-deps.golden +++ b/internal/pipe/nix/testdata/TestBinInstallFormats/linux-only-deps.golden @@ -1,2 +1,2 @@ cp -vr ./%[1]s $out/bin/%[1]s -wrapProgram $out/bin/%[1]s --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ foo bar ])} \ No newline at end of file +wrapProgram $out/bin/%[1]s --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isLinux [ foo bar ])} \ No newline at end of file diff --git a/internal/pipe/nix/testdata/TestBinInstallFormats/mixed-deps.golden b/internal/pipe/nix/testdata/TestBinInstallFormats/mixed-deps.golden index 191663182..71d341c59 100644 --- a/internal/pipe/nix/testdata/TestBinInstallFormats/mixed-deps.golden +++ b/internal/pipe/nix/testdata/TestBinInstallFormats/mixed-deps.golden @@ -1,2 +1,2 @@ cp -vr ./%[1]s $out/bin/%[1]s -wrapProgram $out/bin/%[1]s --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isDarwin [ bar ] ++ lib.optionals stdenv.isLinux [ foo ] ++ [ fish ])} \ No newline at end of file +wrapProgram $out/bin/%[1]s --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isDarwin [ bar ] ++ lib.optionals stdenvNoCC.isLinux [ foo ] ++ [ fish ])} \ No newline at end of file diff --git a/internal/pipe/nix/testdata/TestRunPipe/deps_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/deps_build.nix.golden index 4d680d3f8..f07d33991 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/deps_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/deps_build.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -34,7 +33,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { @@ -49,7 +48,7 @@ pkgs.stdenvNoCC.mkDerivation { installPhase = '' mkdir -p $out/bin cp -vr ./foo $out/bin/foo - wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isDarwin [ chromium ] ++ lib.optionals stdenv.isLinux [ ttyd ] ++ [ fish bash ])} + wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isDarwin [ chromium ] ++ lib.optionals stdenvNoCC.isLinux [ ttyd ] ++ [ fish bash ])} ''; system = system; diff --git a/internal/pipe/nix/testdata/TestRunPipe/deps_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/deps_publish.nix.golden index fa908584b..e814ede6f 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/deps_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/deps_publish.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -34,7 +33,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { @@ -49,7 +48,7 @@ pkgs.stdenvNoCC.mkDerivation { installPhase = '' mkdir -p $out/bin cp -vr ./foo $out/bin/foo - wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isDarwin [ chromium ] ++ lib.optionals stdenv.isLinux [ ttyd ] ++ [ fish bash ])} + wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isDarwin [ chromium ] ++ lib.optionals stdenvNoCC.isLinux [ ttyd ] ++ [ fish bash ])} ''; system = system; diff --git a/internal/pipe/nix/testdata/TestRunPipe/extra-install_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/extra-install_build.nix.golden index 43de28e52..67a4553d7 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/extra-install_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/extra-install_build.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -34,7 +33,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { @@ -49,7 +48,7 @@ pkgs.stdenvNoCC.mkDerivation { installPhase = '' mkdir -p $out/bin cp -vr ./foo $out/bin/foo - wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isDarwin [ chromium ] ++ lib.optionals stdenv.isLinux [ ttyd ] ++ [ fish bash ])} + wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isDarwin [ chromium ] ++ lib.optionals stdenvNoCC.isLinux [ ttyd ] ++ [ fish bash ])} installManPage ./manpages/foo.1.gz ''; diff --git a/internal/pipe/nix/testdata/TestRunPipe/extra-install_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/extra-install_publish.nix.golden index 91c773fde..bbae107c6 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/extra-install_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/extra-install_publish.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -34,7 +33,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { @@ -49,7 +48,7 @@ pkgs.stdenvNoCC.mkDerivation { installPhase = '' mkdir -p $out/bin cp -vr ./foo $out/bin/foo - wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isDarwin [ chromium ] ++ lib.optionals stdenv.isLinux [ ttyd ] ++ [ fish bash ])} + wrapProgram $out/bin/foo --prefix PATH : ${lib.makeBinPath (lib.optionals stdenvNoCC.isDarwin [ chromium ] ++ lib.optionals stdenvNoCC.isLinux [ ttyd ] ++ [ fish bash ])} installManPage ./manpages/foo.1.gz ''; diff --git a/internal/pipe/nix/testdata/TestRunPipe/minimal_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/minimal_build.nix.golden index 03f96de29..360d8c842 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/minimal_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/minimal_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -28,7 +28,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/minimal_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/minimal_publish.nix.golden index 87e7a78e3..1c9bb881f 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/minimal_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/minimal_publish.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -28,7 +28,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/open-pr_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/open-pr_build.nix.golden index 4ce13eb31..3e9e04b1a 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/open-pr_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/open-pr_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -28,7 +28,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/open-pr_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/open-pr_publish.nix.golden index 72cc75b2b..567bc9af1 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/open-pr_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/open-pr_publish.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -28,7 +28,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foo"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/partial_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/partial_build.nix.golden index c8a8345fd..8bf9e57d1 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/partial_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/partial_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -18,7 +18,7 @@ let x86_64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_amd64v1.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "partial"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/partial_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/partial_publish.nix.golden index 2311b3ce3..e956d970b 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/partial_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/partial_publish.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -18,7 +18,7 @@ let x86_64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_amd64v1.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "partial"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/skip-upload-auto_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/skip-upload-auto_build.nix.golden index 4ef51eb9d..5a50eed22 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/skip-upload-auto_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/skip-upload-auto_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -28,7 +28,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "doesnotmatter"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/skip-upload_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/skip-upload_build.nix.golden index 4ef51eb9d..5a50eed22 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/skip-upload_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/skip-upload_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -28,7 +28,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "doesnotmatter"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_build.nix.golden index dc99ecec9..84cea3da4 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -24,7 +24,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_all.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "unibin-replaces"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_publish.nix.golden index 803a334d7..dd69bdeff 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/unibin-replaces_publish.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -24,7 +24,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_all.tar.gz"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "unibin-replaces"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_build.nix.golden index c3560eb92..c3b3a9fad 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_build.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -31,7 +31,7 @@ let aarch64-darwin = "./foo_arm64"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "wrapped-in-dir"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_publish.nix.golden index 23681276b..5866d6479 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/wrapped-in-dir_publish.nix.golden @@ -2,10 +2,10 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles +, stdenvNoCC }: let shaMap = { @@ -31,7 +31,7 @@ let aarch64-darwin = "./foo_arm64"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "wrapped-in-dir"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_build.nix.golden index 2c70d8443..ff0408624 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_build.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -23,7 +22,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.zip"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foozip"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_publish.nix.golden index 9da167054..69dd10e48 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/zip-and-tar_publish.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -23,7 +22,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.zip"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foozip"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_build.nix.golden index d0e26086b..26e66e79f 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_build.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -28,7 +27,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.zip"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foozip"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_publish.nix.golden index 57fb3915e..22b3b08c4 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/zip-with-dependencies_publish.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -28,7 +27,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.zip"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foozip"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/zip_build.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/zip_build.nix.golden index 7ce96a5bf..8c4adc5b5 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/zip_build.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/zip_build.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -27,7 +26,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.zip"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foozip"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/testdata/TestRunPipe/zip_publish.nix.golden b/internal/pipe/nix/testdata/TestRunPipe/zip_publish.nix.golden index f545a0f9d..d6a56b1da 100644 --- a/internal/pipe/nix/testdata/TestRunPipe/zip_publish.nix.golden +++ b/internal/pipe/nix/testdata/TestRunPipe/zip_publish.nix.golden @@ -2,7 +2,6 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles @@ -27,7 +26,7 @@ let aarch64-darwin = "https://dummyhost/download/v1.2.1/foo_darwin_arm64.zip"; }; in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "foozip"; version = "1.2.1"; src = fetchurl { diff --git a/internal/pipe/nix/tmpl.nix b/internal/pipe/nix/tmpl.nix index d740405c4..d7b24d144 100644 --- a/internal/pipe/nix/tmpl.nix +++ b/internal/pipe/nix/tmpl.nix @@ -2,14 +2,13 @@ # vim: set ft=nix ts=2 sw=2 sts=2 et sta { system ? builtins.currentSystem -, pkgs , lib , fetchurl , installShellFiles {{- if .Dependencies }} , makeWrapper +{{- end }} , stdenvNoCC -{{- end -}} {{- range $index, $element := .Dependencies }} , {{ . -}} {{- end }} @@ -89,7 +88,7 @@ let }; {{- end }} in -pkgs.stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation { pname = "{{ .Name }}"; version = "{{ .Version }}"; src = fetchurl {