diff options
author | tv <tv@krebsco.de> | 2017-07-13 00:37:54 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-07-13 00:37:54 +0200 |
commit | bc6c6a3164d31141f39333914c1b15ff261e7859 (patch) | |
tree | 8bff8dd19f1d9f9fcc2b78b7c8d3fb81a332aab4 /lass/1systems/iso.nix | |
parent | 4da01794605291bdb7bd9fa9dc7109764f4faf58 (diff) | |
parent | 7212de210bb7fc751ffade00d6b1b08f195ddf47 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/iso.nix')
-rw-r--r-- | lass/1systems/iso.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index b45d5b228..820ef74b8 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -4,12 +4,11 @@ with import <stockholm/lib>; { imports = [ <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix> - ../../krebs - ../3modules - ../5pkgs - ../2configs/mc.nix - ../2configs/nixpkgs.nix - ../2configs/vim.nix + <stockholm/krebs> + <stockholm/lass/3modules> + <stockholm/lass/5pkgs> + <stockholm/lass/2configs/mc.nix> + <stockholm/lass/2configs/vim.nix> { # /dev/stderr doesn't work. I don't know why # /proc/self doesn't seem to work correctly |