public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-06-30 23:58:07 -07:00
parent 857efa12fb ddf15bc78a
commit 612f0bdd67
71 changed files with 1388 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/edac-utils/default.nix
View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = http://github.com/grondo/edac-utils;
description = "handles the reporting of hardware-related memory errors.";
description = "Handles the reporting of hardware-related memory errors";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];

4
pkgs/os-specific/linux/kernel/linux-3.10.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.10.81";
version = "3.10.82";
extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0hza9wsy9x2113crlwygl06lspwlahq09nifnmdacfkqcxp4r3ng";
sha256 = "177rzyd9mxvbacy242abk7annhlm48rbdspr78y5qqsqsgihh88y";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.14.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.14.45";
version = "3.14.46";
# Remember to update grsecurity!
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0jfbwl0daba41cwkn67rk7an9g6cbljxq8wlwnr321mfnd3mnx4c";
sha256 = "1ran8fi1ldc89x3gpxwkkfl64mln4sl0rq5bbl8imlca5nljmzkb";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-3.18.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.18.16";
version = "3.18.17";
extraMeta.branch = "3.18";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0c2530amgsk29ina9mfvlncki64w0zs16d2k8bghq3fv9k2qv3nr";
sha256 = "08512kqvy91jh26jld2h3d9xq3wsfbyylzawjgn75x4r5li6y5ha";
};
features.iwlwifi = true;

4
pkgs/os-specific/linux/kernel/linux-4.0.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "4.0.6";
version = "4.0.7";
# Remember to update grsecurity!
extraMeta.branch = "4.0";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0n0w2k52m3cn286f413jmzwffyk3g28y4n7d41wc93zvgm720lr9";
sha256 = "01c68w6lygzjzllv7xgnd1hm3339rs0fvd8q26n6bdfa95aj554m";
};
features.iwlwifi = true;

5
pkgs/os-specific/linux/kernel/linux-4.1.nix
View File

@@ -1,13 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "4.1";
modDirVersion = "4.1.0";
version = "4.1.1";
extraMeta.branch = "4.1";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "17rdly75zh49m6r32yy03xappl7ajcqbznq09pm1q7mcb841zxfa";
sha256 = "12bfih081cbqlgmgq1fqdvvpxga5saj4kkvhawsl4fpg4mybrml8";
};
features.iwlwifi = true;

12
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -65,17 +65,17 @@ rec {
};
grsecurity_stable = grsecPatch
{ kversion = "3.14.45";
revision = "201506232103";
{ kversion = "3.14.46";
revision = "201506300711";
branch = "stable";
sha256 = "1f4fm7r6pbspdw9l1d1mrjj1jpyh0l2vlq1lnqs54v3xzwr933py";
sha256 = "0xjqh7yc4vzgbnql16aylla9b0cjh442sywp8bvkh0ny5m3rj64l";
};
grsecurity_unstable = grsecPatch
{ kversion = "4.0.6";
revision = "201506232104";
{ kversion = "4.0.7";
revision = "201506300712";
branch = "test";
sha256 = "0him41fm0hw857ibvfmvpsrk2a8x492d4cy4hlbqyfk35rcmpfdf";
sha256 = "0rw0wx5nc244m2q7f9y832mmkv8gb8yv1rn1w2pyq8brckiswni7";
};
grsec_fix_path =