summaryrefslogtreecommitdiffstats
path: root/modules/uriel
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-19 01:00:11 +0200
committertv <tv@shackspace.de>2015-06-19 01:00:11 +0200
commite56f2179cb616d5c3773e6d125858fbb52755a3a (patch)
treec7844cc7f90282ad231a379dcc0b6b8b48562f43 /modules/uriel
parent846a759d7397ab7d7a79e374508c9b68a4024e50 (diff)
parent98775ff29ec15452a56a6e3262d454c41d7ee87b (diff)
Merge remote-tracking branch 'mors/master' into morse-merge
Diffstat (limited to 'modules/uriel')
-rw-r--r--modules/uriel/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix
index a54dfa7ec..7f2b9032b 100644
--- a/modules/uriel/default.nix
+++ b/modules/uriel/default.nix
@@ -17,11 +17,12 @@
../lass/sshkeys.nix
../lass/bird.nix
./repos.nix
+ ../lass/chromium-patched.nix
];
nixpkgs = {
url = "https://github.com/Lassulus/nixpkgs";
- rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
+ rev = "45c99e522dcc4ef24cf71dbe38d94a308cb30530";
};
networking.hostName = "uriel";