diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-15 02:02:46 -0700 |
| commit | 25e60feb725f1ce58590a097ffe088bbf14717e2 (patch) | |
| tree | 1cccfe708e755ca59aaa18135d8c1bc516688298 /pkgs/os-specific | |
| parent | 333f145d7604f07e3b2164b459b46e075fea81f4 (diff) | |
| parent | 369febb9569bdd3ddb76d8de2db6e27441d13e9f (diff) | |
| download | nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.gz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.bz2 nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.lz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.xz nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.zst nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index dc166da3ae1d..bbe35fe96996 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-06-30"; + version = "2015-07-12"; src = fetchgit { url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git"; - rev = "ea901a57054441907e9b127ad407a8554532f992"; - sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67"; + rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf"; + sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index acfe421ac105..0c31c558c47e 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.2-rc1"; - modDirVersion = "4.2.0-rc1"; + version = "4.2-rc2"; + modDirVersion = "4.2.0-rc2"; extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0a9zr1jf2c110lvd7wi4jxxk2iw6san31yh8hwlahkkb8kh4wliw"; + sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w"; }; features.iwlwifi = true; |