diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-20 19:39:28 +0100 |
| commit | ac6761c9081134baaa7dae18f06cbfaca38270d5 (patch) | |
| tree | a1ff0e93e8907624d65aff367496513d3dc47374 /pkgs/os-specific | |
| parent | 177667eea987898097e854a54962ff90bbf4fa35 (diff) | |
| parent | 8088837dc8f35ef7853787f88bb1db7248900cc4 (diff) | |
| download | nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.gz nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.bz2 nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.lz nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.xz nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.zst nixpkgs-ac6761c9081134baaa7dae18f06cbfaca38270d5.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.13.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libaio/default.nix | 9 |
3 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 01a605aac30..8b96a321634 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -63,7 +63,9 @@ with stdenv.lib; # Networking options. IP_PNP n + ${optionalString (versionOlder version "3.13") '' IPV6_PRIVACY y + ''} NETFILTER_ADVANCED y IP_VS_PROTO_TCP y IP_VS_PROTO_UDP y @@ -176,7 +178,7 @@ with stdenv.lib; AIC79XX_DEBUG_ENABLE n AIC7XXX_DEBUG_ENABLE n AIC94XX_DEBUG n - ${optionalString (versionAtLeast version "3.3") '' + ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") '' AUDIT_LOGINUID_IMMUTABLE y ''} B43_PCMCIA y diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix new file mode 100644 index 00000000000..967de85b7b3 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.13"; + + modDirVersion = "3.13.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 57137400b2f..bf30530e9ad 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "libaio-0.3.109"; - src = fetchurl { - url = "mirror://kernel/linux/libs/aio/${name}.tar.bz2"; - sha256 = "15772ki2wckf2mj4gm1vhrsmpd6rq20983nhlkfghjfblghgrkmm"; + src = fetchgit { + url = https://git.fedorahosted.org/git/libaio.git; + rev = "refs/tags/${name}"; + sha256 = "1wbziq0hqvnbckpxrz1cgr8dlw3mifs4xpy3qhnagbrrsmrq2rhi"; }; makeFlags = "prefix=$(out)"; |