diff options
author | tv <tv@krebsco.de> | 2016-03-10 14:18:12 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-03-10 14:18:12 +0100 |
commit | cf416ecd6848a4f9e96126220fe86c50b2e86ca7 (patch) | |
tree | 0a40c4ce52279fbf54de3ff847ae934e79a765f0 /makefu/2configs/default.nix | |
parent | 17be0772c5cfcb57f99299ad541b76dfabf8a62d (diff) | |
parent | 4ca96e8b04056ae9d06c2ff2e153d2e592991c15 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/default.nix')
-rw-r--r-- | makefu/2configs/default.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 3043a1af..313ccbec 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -4,13 +4,6 @@ with config.krebs.lib; { system.stateVersion = "15.09"; - system.replaceRuntimeDependencies = with pkgs.lib; - [{original = pkgs.glibc; replacement = pkgs.stdenv.lib.overrideDerivation pkgs.glibc (oldAttr: { patches = oldAttr.patches ++ - [(pkgs.fetchurl { url = "https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/glibc/cve-2015-7547.patch"; - sha256 = "0awpc4rp2x27rjpj83ps0rclmn73hsgfv2xxk18k82w4hdxqpp5r";})]; - });} - ]; - imports = [ { users.extraUsers = @@ -29,7 +22,7 @@ with config.krebs.lib; source = mapAttrs (_: mkDefault) { nixpkgs = { url = https://github.com/nixos/nixpkgs; - rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # unstable @ 2015-01-27, tested on wry + rev = "40c586b7ce2c559374df435f46d673baf711c543"; # unstable @ 2016-02-27, tested on wry }; secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/"; stockholm = "/home/makefu/stockholm"; |