diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-06 00:02:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 00:02:41 +0000 |
| commit | 3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5 (patch) | |
| tree | ff92a096aebd9a5092def057ec7e6b889fc623c0 /pkgs/build-support | |
| parent | e2166cd22bf43d56483d27589b5d630be818fc3a (diff) | |
| parent | e321dcea0de984e086311273c502fa466642d833 (diff) | |
| download | nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.tar nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.tar.gz nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.tar.bz2 nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.tar.lz nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.tar.xz nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.tar.zst nixpkgs-3dc8bd98b93633fe1baa00fa6e05cbe7eca577d5.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/test-equal-derivation.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/test-equal-derivation.nix b/pkgs/build-support/test-equal-derivation.nix index 5d2185ce165..652f3716b2a 100644 --- a/pkgs/build-support/test-equal-derivation.nix +++ b/pkgs/build-support/test-equal-derivation.nix @@ -23,7 +23,7 @@ let drvB = builtins.unsafeDiscardOutputDependency b.drvPath or (throw "testEqualDerivation third argument must be a package"); name = if a?name - then lib.strings.sanitizeDerivationName "testEqualDerivation-${a.name}" + then "testEqualDerivation-${a.name}" else "testEqualDerivation"; in if drvA == drvB then diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index d864eced281..124ade8cfa0 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -70,8 +70,7 @@ rec { # name of the resulting derivation }: buildCommand: stdenv.mkDerivation ({ - name = lib.strings.sanitizeDerivationName name; - inherit buildCommand; + inherit buildCommand name; passAsFile = [ "buildCommand" ] ++ (derivationArgs.passAsFile or []); } |