mirror of
https://github.com/NixOS/nix
synced 2025-06-25 02:21:16 +02:00
Use version correctly in nix-daemon-compat-tests derivation
Previously, a version would be appended to the pname which already contained a version.
This commit is contained in:
parent
1edf868213
commit
6d86839a02
1 changed files with 4 additions and 4 deletions
|
@ -18,12 +18,12 @@ let
|
|||
|
||||
testNixVersions = pkgs: daemon:
|
||||
pkgs.nixComponents.nix-functional-tests.override {
|
||||
pname =
|
||||
"nix-daemon-compat-tests"
|
||||
+ lib.optionalString
|
||||
pname = "nix-daemon-compat-tests";
|
||||
version =
|
||||
lib.optionalString
|
||||
(lib.versionAtLeast daemon.version "2.4pre20211005" &&
|
||||
lib.versionAtLeast pkgs.nix.version "2.4pre20211005")
|
||||
"-${pkgs.nix.version}-with-daemon-${daemon.version}";
|
||||
"${pkgs.nix.version}-with-daemon-${daemon.version}";
|
||||
|
||||
test-daemon = daemon;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue