hosts mu,wu: use common nixpkgs

This commit is contained in:
tv 2015-05-20 16:28:40 +02:00
parent 7a406946f0
commit 040bd36f8e
2 changed files with 11 additions and 0 deletions

View File

@ -11,6 +11,7 @@ in
{ {
imports = [ imports = [
<secrets/mu.hashedPasswords.nix> <secrets/mu.hashedPasswords.nix>
../common/nixpkgs.nix
../tv/base.nix ../tv/base.nix
../tv/exim-retiolum.nix ../tv/exim-retiolum.nix
../tv/retiolum.nix ../tv/retiolum.nix
@ -19,6 +20,11 @@ in
nix.maxJobs = 2; nix.maxJobs = 2;
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs";
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
};
services.udev.extraRules = '' services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0" SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0" SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"

View File

@ -10,6 +10,7 @@ in
imports = [ imports = [
./hosts.nix ./hosts.nix
./iptables.nix ./iptables.nix
../common/nixpkgs.nix
../tv/base.nix ../tv/base.nix
../tv/exim-retiolum.nix ../tv/exim-retiolum.nix
../tv/nginx.nix ../tv/nginx.nix
@ -25,6 +26,10 @@ in
nix.maxJobs = 8; nix.maxJobs = 8;
nixpkgs = {
url = "https://github.com/NixOS/nixpkgs";
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
};
services.udev.extraRules = '' services.udev.extraRules = ''
SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0" SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"