diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-04 12:02:11 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-04 12:02:11 +0100 |
| commit | c9cfaa010dabbd37a329a9690debf7cf7ef5e3ba (patch) | |
| tree | cf654f1b5c60e75b61e804c824255e1aa90ea5a4 | |
| parent | 4ab103ba475b0add519054772f2ff3b542184466 (diff) | |
ma: finish merge of new sources v2, nixos compatibility
| -rw-r--r-- | makefu/2configs/default.nix | 12 | ||||
| -rw-r--r-- | makefu/2configs/wwan.nix | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index a98393e2b..2b4e31119 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -20,10 +20,10 @@ with lib; build = { target = mkDefault "root@${config.krebs.build.host.name}"; user = config.krebs.users.makefu; - source = { + source = mapAttrs (_: mkDefault) { upstream-nixpkgs = { - url = mkDefault https://github.com/nixos/nixpkgs; - rev = mkDefault "93d8671e2c6d1d25f126ed30e5e6f16764330119"; # unstable @ 2015-01-03, tested on filepimp + url = https://github.com/nixos/nixpkgs; + rev = "93d8671e2c6d1d25f126ed30e5e6f16764330119"; # unstable @ 2015-01-03, tested on filepimp }; secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/"; stockholm = "/home/makefu/stockholm"; @@ -80,11 +80,7 @@ with lib; ]; environment.variables = { - NIX_PATH = with config.krebs.build.source; with dir; with git; - mkForce (concatStringsSep ":" [ - "nixpkgs=${nixpkgs.target-path}" - "${nixpkgs.target-path}" - ]); + NIX_PATH = mkForce "/var/src"; EDITOR = mkForce "vim"; }; diff --git a/makefu/2configs/wwan.nix b/makefu/2configs/wwan.nix index 1e76cd28a..0eb0c97d7 100644 --- a/makefu/2configs/wwan.nix +++ b/makefu/2configs/wwan.nix @@ -1,7 +1,6 @@ _: { - imports = [ ../3modules ]; makefu.umts = { enable = true; modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01"; |