diff options
author | lassulus <lass@aidsballs.de> | 2015-09-27 20:08:36 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-09-27 20:08:36 +0200 |
commit | a9f6f7ac7b8e70633164d10980d1d041f34be3ac (patch) | |
tree | 13a8bdfafd994c999c5eeae3ff5e2537a4d96f0f /makefu/1systems/pnp.nix | |
parent | b6383dba83a2e9ec6ada40fb780c15a56c8d715e (diff) | |
parent | bc2bd6e2f6e9295b14e641b82bff62b40641988d (diff) |
Merge branch 'makefu'
Diffstat (limited to 'makefu/1systems/pnp.nix')
-rw-r--r-- | makefu/1systems/pnp.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 2dce87d5..497c03e1 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -9,6 +9,7 @@ [ # Include the results of the hardware scan. # Base ../2configs/base.nix + ../2configs/base-sources.nix ../2configs/tinc-basic-retiolum.nix # HW/FS @@ -38,12 +39,6 @@ nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; - krebs.build.deps = { - nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "03921972268934d900cc32dad253ff383926771c"; - }; - }; networking.firewall.allowedTCPPorts = [ # nginx runs on 80 |