From 58f9896a43d43d6e61a4ce56c522b3f03926de37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 31 Oct 2015 00:22:32 +0100 Subject: [PATCH 1/2] nixUnstable: Update to 1.11pre4273_71039be --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e76e2e811f5..1d8c5d86b23 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -97,10 +97,10 @@ in rec { }; nixUnstable = lib.lowPrio (common rec { - name = "nix-1.11pre4244_133a421"; + name = "nix-1.11pre4273_71039be"; src = fetchurl { - url = "http://hydra.nixos.org/build/26680779/download/4/${name}.tar.xz"; - sha256 = "cb98e3e0791c3f5a508990e8ddba02ce7fe9282a9fe151c743206c1410cdfd93"; + url = "http://hydra.nixos.org/build/27061065/download/4/${name}.tar.xz"; + sha256 = "4a1bc541868c317708fc8b532e22f5ead8d9759eee6a2680719584841cf897af"; }; }); From ea49c910a57d590f71c6adb80a58d2f70033b774 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 30 Oct 2015 16:08:13 -0700 Subject: [PATCH 2/2] kernel: 3.18.22 -> 3.18.23 --- pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 6ae9814c55d..ffa220387b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.22"; + version = "3.18.23"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0b6f0akcsjbybwf3r1b414k539cwnf5phz3hb2zkda9ds13bpp0w"; + sha256 = "1jj3afa9p306j7gv13wsjwy322sdaz6jflhvzp6gwjfylncwyskj"; }; features.iwlwifi = true;