From 64a1dc64a3a7daf57e1ebc677e35c4dc89d9c36b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 28 Feb 2016 02:26:20 +0100
Subject: ma 2 default: back to unstable, remove runtime-patch

---
 makefu/2configs/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 7166c0cc9..313ccbec7 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/fc48bf5a2ceb908b73dc035374e2ec5a31086aa2/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";
-- 
cgit v1.2.3