diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-08-15 17:12:23 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-08-15 17:36:41 +0200 |
commit | fbafeb7ad5dd6196fcc5d84264e1706653a62f81 (patch) | |
tree | 5e80c4048b4206232b22dc2a8e893e6575ba93d8 /pkgs/pkgs-lib | |
parent | 1359293549af4f8ca536716d0432f3cdd0afe0c6 (diff) |
treewide: runCommandNoCC -> runCommand
This has been synonymous for ~5y.
Diffstat (limited to 'pkgs/pkgs-lib')
-rw-r--r-- | pkgs/pkgs-lib/formats.nix | 4 | ||||
-rw-r--r-- | pkgs/pkgs-lib/tests/formats.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 4d5395664612..44c8f9135439 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -38,7 +38,7 @@ rec { }; in valueType; - generate = name: value: pkgs.runCommandNoCC name { + generate = name: value: pkgs.runCommand name { nativeBuildInputs = [ pkgs.jq ]; value = builtins.toJSON value; passAsFile = [ "value" ]; @@ -121,7 +121,7 @@ rec { }; in valueType; - generate = name: value: pkgs.runCommandNoCC name { + generate = name: value: pkgs.runCommand name { nativeBuildInputs = [ pkgs.remarshal ]; value = builtins.toJSON value; passAsFile = [ "value" ]; diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 679fde015228..af19f6100eef 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -14,7 +14,7 @@ let }) [ def ]); in formatSet.generate "test-format-file" config; - runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' + runBuildTest = name: { drv, expected }: pkgs.runCommand name {} '' if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then touch "$out" else |