mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 04:35:41 +03:00
nixops_unstable: Fix tests attribute
The .overrideAttrs part is ok now, but a "passthru' workaround is necessary now. See https://github.com/NixOS/nixpkgs/pull/247520
This commit is contained in:
parent
bb02d10364
commit
4b51c5360f
2 changed files with 12 additions and 12 deletions
|
@ -14,11 +14,12 @@ let
|
|||
# inherit testsForPackage;
|
||||
};
|
||||
|
||||
testsForPackage = lib.makeOverridable (args: lib.recurseIntoAttrs {
|
||||
testsForPackage = args: lib.recurseIntoAttrs {
|
||||
legacyNetwork = testLegacyNetwork args;
|
||||
});
|
||||
passthru.override = args': testsForPackage (args // args');
|
||||
};
|
||||
|
||||
testLegacyNetwork = { nixopsPkg }: pkgs.nixosTest ({
|
||||
testLegacyNetwork = { nixopsPkg, ... }: pkgs.nixosTest ({
|
||||
name = "nixops-legacy-network";
|
||||
nodes = {
|
||||
deployer = { config, lib, nodes, pkgs, ... }: {
|
||||
|
@ -52,7 +53,7 @@ let
|
|||
chmod 0400 ~/.ssh/id_ed25519
|
||||
'';
|
||||
serverNetworkJSON = pkgs.writeText "server-network.json"
|
||||
(builtins.toJSON nodes.server.config.system.build.networkConfig);
|
||||
(builtins.toJSON nodes.server.system.build.networkConfig);
|
||||
in
|
||||
''
|
||||
import shlex
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue