wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 12:21:48 +02:00
Code Activity

Use version correctly in nix-daemon-compat-tests derivation

Browse source 
Previously, a version would be appended to the pname which already
contained a version.
This commit is contained in:
Robert Hensing 2024-12-09 17:34:56 +01:00
parent 1edf868213
commit 6d86839a02
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/hydra.nix
View file

@ -18,12 +18,12 @@ let
testNixVersions = pkgs: daemon: testNixVersions = pkgs: daemon:
pkgs.nixComponents.nix-functional-tests.override { pkgs.nixComponents.nix-functional-tests.override {
pname = pname = "nix-daemon-compat-tests";
"nix-daemon-compat-tests" version =
+ lib.optionalString lib.optionalString
(lib.versionAtLeast daemon.version "2.4pre20211005" && (lib.versionAtLeast daemon.version "2.4pre20211005" &&
lib.versionAtLeast pkgs.nix.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; test-daemon = daemon;
}; };