diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 20:14:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 20:14:08 +0200 |
| commit | f2352f7ecfe86249c73416263b397175e8a6f06e (patch) | |
| tree | 027474c621c6407a717c315894096e5f1679abfb /pkgs/os-specific | |
| parent | 5a98b9f5140578d8cbd4db8bddfe01e24249c2a9 (diff) | |
| parent | bd7f3fbf0f1294e5b32caacbfa66b984aec85c5f (diff) | |
| download | nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.gz nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.bz2 nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.lz nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.xz nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.zst nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.zip | |
Merge recent master
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.15.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 6 |
2 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix new file mode 100644 index 000000000000..69721292b5b0 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.15"; + extraMeta.branch = "3.15"; + modDirVersion = "3.15.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "153pn0zjzgi3ls4gy12n900ayskpq0yncn0vra5glh20ps3px4n3"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 522907e2aee2..3445c3cd2dd3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -2,13 +2,13 @@ , xz, pam, acl, cryptsetup, libuuid, m4, utillinux , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl , kexectools, libmicrohttpd, linuxHeaders -, python ? null, pythonSupport ? false +, pythonPackages ? null, pythonSupport ? false , autoreconfHook }: assert stdenv.isLinux; -assert pythonSupport -> python != null; +assert pythonSupport -> pythonPackages != null; stdenv.mkDerivation rec { version = "212"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl libmicrohttpd linuxHeaders autoreconfHook - ] ++ stdenv.lib.optional pythonSupport python; + ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml]; configureFlags = [ "--localstatedir=/var" |