diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-02 12:24:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 12:24:09 +0000 |
| commit | ec161d2240242c215d8280b00aa82f7e3f95d64e (patch) | |
| tree | 32001499525f4a7405958084db302aa141925c50 /pkgs/tools/package-management | |
| parent | 6221782074b04dfe57322b0740883d35cb042615 (diff) | |
| parent | 0224ebfc4cdeac3b4f6c9b813dbce5511221a74a (diff) | |
| download | nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.gz nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.bz2 nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.lz nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.xz nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.tar.zst nixpkgs-ec161d2240242c215d8280b00aa82f7e3f95d64e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f6c0e4de199..06f5a651f69 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -98,7 +98,7 @@ common = # when cross-compiling. lib.optionalString ( stdenv.buildPlatform != stdenv.hostPlatform && - (lib.versionOlder "2.3.8" (lib.traceVal version) && !is24) + (lib.versionOlder "2.3.8" version && !is24) # The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings ) '' mkdir tmp/ |