diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
| commit | 9db2421d1f65beb38911e8133349193db0042a1d (patch) | |
| tree | 90a2f4a56cf871c74aad86138d85e9631c2c2f86 /nixos/lib | |
| parent | 9caab8ff4a1ad36fbc0ab866f1b0f7c15d35ba90 (diff) | |
| parent | 8d88e4f6c7b09fe811d92b346e5eafefe07a47c9 (diff) | |
| download | nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.gz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.bz2 nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.lz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.xz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.zst nixlib-9db2421d1f65beb38911e8133349193db0042a1d.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/testing.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 690f7dfd5fac..0bb3fd53e853 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -1,5 +1,5 @@ { system -, pkgs +, pkgs ? import ../.. { inherit system config; } # Use a minimal kernel? , minimal ? false # Ignored |