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

Merge branch 'master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
This commit is contained in:
Domen Kožar
2014-12-07 14:02:48 +01:00
parent 43c4d78bc6 ad4ad11fbc
commit 4aa3eec330
299 changed files with 22706 additions and 13278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
version = "3.18-rc6";
modDirVersion = "3.18.0-rc6";
version = "3.18-rc7";
modDirVersion = "3.18.0-rc7";
extraMeta.branch = "3.18";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
sha256 = "03flqar4jgaw042bf1v9ay3sg6y18irqklbpxk5x1g1yyjpbc6h8";
sha256 = "1zq7jd33jq4ibvjdsj8cm4zlgjag7j8r7w7ajmzivr7npdb9fvvk";
};
features.iwlwifi = true;

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

@@ -61,16 +61,16 @@ rec {
grsecurity_stable = grsecPatch
{ kversion = "3.14.25";
revision = "201411260106";
revision = "201412040016";
branch = "stable";
sha256 = "19131hkbf8zrqq31iiw99hslb5g29yqfl67jzlc4y4c8092s7fdm";
sha256 = "0mifqb67v9y8qdsq6kr08gmd05c57575cv2xz1k0djgmjb3hvnpp";
};
grsecurity_unstable = grsecPatch
{ kversion = "3.17.4";
revision = "201411260107";
revision = "201412040017";
branch = "test";
sha256 = "1ynwmgm5c2fcd2dr76s3sqap3bv9b04p7qvf92pa1p4hgj2lva2n";
sha256 = "1mzqsqc8b4zbjy53vvvy7zl4gbzk7462ljr5x4jvah1mb08i5dmp";
};
grsec_fix_path =