commit 6c68fbd4e1f8beac39cb1f499ff90c78256262d6 · pyrox.dev/nixpkgs

+1 -3

nixos/lib/build-vms.nix

···

       1
       1
       -
       { system, minimal ? false, config ? {} }:

     

       2
       2
       -
       

     

       3
       3
       -
       let pkgs = import ../.. { inherit system config; }; in

     

       1
       1
       +
       { system, pkgs, minimal ? false, config ? {} }:

     

       4
       2
        
       

     

       5
       3
        
       with pkgs.lib;

     

       6
       4
        
       with import ../lib/qemu-flags.nix { inherit pkgs; };

+2 -2

nixos/lib/testing.nix

···

       1
       1
       -
       { system, minimal ? false, config ? {} }:

     

       1
       1
       +
       { system, pkgs, minimal ? false, config ? {} }:

     

       2
       2
        
       

     

       3
       3
       -
       with import ./build-vms.nix { inherit system minimal config; };

     

       3
       3
       +
       with import ./build-vms.nix { inherit system pkgs minimal config; };

     

       4
       4
        
       with pkgs;

     

       5
       5
        
       

     

       6
       6
        
       let

+5 -1

nixos/modules/installer/tools/nixos-build-vms/build-vms.nix

···

       1
       1
        
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? {}

     

       2
       3
        
       , networkExpr

     

       3
       4
        
       }:

     

       4
       5
        
       

     

       5
       6
        
       let nodes = import networkExpr; in

     

       6
       7
        
       

     

       7
       7
       -
       with import ../../../../lib/testing.nix { inherit system; };

     

       8
       8
       +
       with import ../../../../lib/testing.nix {

     

       9
       9
       +
         inherit system;

     

       10
       10
       +
         pkgs = import ../.. { inherit system config; }

     

       11
       11
       +
       };

     

       8
       12
        
       

     

       9
       13
        
       (makeTest { inherit nodes; testScript = ""; }).driver

+5 -2

nixos/tests/boot.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       5
       8
        
       

     

       6
       9
        
       let

+5 -2

nixos/tests/buildbot.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       

     

       5
       8
        
       let

     

       6
       9
        
         # Test ensures buildbot master comes up correctly and workers can connect

+5 -2

nixos/tests/certmgr.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       let

     

       5
       8
        
         mkSpec = { host, service ? null, action }: {

     

       6
       9
        
           inherit action;

+3 -2

nixos/tests/chromium.nix

···

       1
       1
        
       { system ? builtins.currentSystem

     

       2
       2
       -
       , pkgs ? import ../.. { inherit system; }

     

       2
       2
       +
       , config ? {}

     

       3
       3
       +
       , pkgs ? import ../.. { inherit system config; }

     

       3
       4
        
       , channelMap ? {

     

       4
       5
        
           stable = pkgs.chromium;

     

       5
       6
        
           beta   = pkgs.chromiumBeta;

     
···

       7
       8
        
         }

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       10
       -
       with import ../lib/testing.nix { inherit system; };

     

       11
       11
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       11
       12
        
       with pkgs.lib;

     

       12
       13
        
       

     

       13
       14
        
       mapAttrs (channel: chromiumPkg: makeTest rec {

+5 -2

nixos/tests/cloud-init.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       5
       8
        
       

     

       6
       9
        
       let

+5 -2

nixos/tests/ec2.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       5
       8
        
       

     

       6
       9
        
       let

+8 -2

nixos/tests/elk.nix

···

       1
       1
       -
       { system ? builtins.currentSystem, enableUnfree ? false }:

     

       2
       2
       -
       with import ../lib/testing.nix { inherit system; };

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; },

     

       4
       4
       +
         enableUnfree ? false

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       3
       8
        
       with pkgs.lib;

     

       9
       9
       +
       

     

       4
       10
        
       let

     

       5
       11
        
         esUrl = "http://localhost:9200";

     

       6
       12

+5 -2

nixos/tests/gitea.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       5
       8
        
       

     

       6
       9
        
       {

+5 -2

nixos/tests/installer.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       5
       8
        
       

     

       6
       9
        
       let

+6 -2

nixos/tests/kafka.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       2
       2
       -
       with import ../lib/testing.nix { inherit system; };

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       3
       7
        
       with pkgs.lib;

     

       4
       8
        
       

     

       5
       9
        
       let

+5 -2

nixos/tests/keymap.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       

     

       5
       8
        
       let

     

       6
       9
        
         readyFile  = "/tmp/readerReady";

+5 -2

nixos/tests/kubernetes/base.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       5
       8
        
       

     

       6
       9
        
       let

+6 -2

nixos/tests/make-test.nix

···

       1
       1
       -
       f: { system ? builtins.currentSystem, ... } @ args:

     

       1
       1
       +
       f: {

     

       2
       2
       +
         system ? builtins.currentSystem,

     

       3
       3
       +
         pkgs ? import ../.. { inherit system; config = {}; },

     

       4
       4
       +
         ...

     

       5
       5
       +
       } @ args:

     

       2
       6
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       7
       7
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       8
        
       

     

       5
       9
        
       makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f)

+3 -1

nixos/tests/networking.nix

···

       1
       1
        
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? {}

     

       3
       3
       +
       , pkgs ? import ../.. { inherit system config; },

     

       2
       4
        
       # bool: whether to use networkd in the tests

     

       3
       5
        
       , networkd }:

     

       4
       6
        
       

     

       5
       5
       -
       with import ../lib/testing.nix { inherit system; };

     

       7
       7
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       6
       8
        
       with pkgs.lib;

     

       7
       9
        
       

     

       8
       10
        
       let

+7 -4

nixos/tests/nextcloud/default.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       {

     

       3
       3
       -
         basic = import ./basic.nix { inherit system; };

     

       4
       4
       -
         with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system; };

     

       5
       5
       -
         with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system; };

     

       6
       6
       +
         basic = import ./basic.nix { inherit system pkgs; };

     

       7
       7
       +
         with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system pkgs; };

     

       8
       8
       +
         with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system pkgs; };

     

       6
       9
        
       }

+7 -2

nixos/tests/postgresql.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       2
       2
       -
       with import ../lib/testing.nix { inherit system; };

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       3
       7
        
       with pkgs.lib;

     

       8
       8
       +
       

     

       4
       9
        
       let

     

       5
       10
        
         postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { };

     

       6
       11
        
         test-sql = pkgs.writeText "postgresql-test" ''

+5 -2

nixos/tests/predictable-interface-names.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       let

     

       4
       4
       -
         inherit (import ../lib/testing.nix { inherit system; }) makeTest pkgs;

     

       7
       7
       +
         inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest;

     

       5
       8
        
       in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {

     

       6
       9
        
         name = pkgs.lib.optionalString (!predictable) "un" + "predictable"

     

       7
       10
        
              + pkgs.lib.optionalString withNetworkd "Networkd";

+7 -2

nixos/tests/rspamd.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       2
       2
       -
       with import ../lib/testing.nix { inherit system; };

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       3
       7
        
       with pkgs.lib;

     

       8
       8
       +
       

     

       4
       9
        
       let

     

       5
       10
        
         initMachine = ''

     

       6
       11
        
           startAll

+6 -2

nixos/tests/rsyslogd.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       with pkgs.lib;

     

       8
       8
       +
       

     

       5
       9
        
       {

     

       6
       10
        
         test1 = makeTest {

     

       7
       11
        
           name = "rsyslogd-test1";

+5 -2

nixos/tests/run-in-machine.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       

     

       5
       8
        
       let

     

       6
       9
        
         output = runInMachine {

+5 -2

nixos/tests/sddm.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       

     

       5
       8
        
       let

     

       6
       9
        
         inherit (pkgs) lib;

+7 -2

nixos/tests/virtualbox.nix

···

       1
       1
       -
       { system ? builtins.currentSystem, debug ? false, enableUnfree ? false }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; },

     

       4
       4
       +
         debug ? false,

     

       5
       5
       +
         enableUnfree ? false

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       8
       8
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       9
        
       with pkgs.lib;

     

       5
       10
        
       

     

       6
       11
        
       let

+5 -2

nixos/tests/zfs.nix

···

       1
       1
       -
       { system ? builtins.currentSystem }:

     

       1
       1
       +
       { system ? builtins.currentSystem,

     

       2
       2
       +
         config ? {},

     

       3
       3
       +
         pkgs ? import ../.. { inherit system config; }

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       3
       -
       with import ../lib/testing.nix { inherit system; };

     

       6
       6
       +
       with import ../lib/testing.nix { inherit system pkgs; };

     

       4
       7
        
       

     

       5
       8
        
       let

     

       6
       9