diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
| commit | a26c8e9b835647ae39d4259cfd55e8001ee57b93 (patch) | |
| tree | 55fe17fed5fc7625146a47e7f0e14b6581c18473 /pkgs/os-specific | |
| parent | fa5ad20922cbc2b4ffbbb74edbc22d650d80441d (diff) | |
| parent | 9fd510e95ad8dd2d0e4c92f12fd9249594c30f23 (diff) | |
| download | nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.gz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.bz2 nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.lz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.xz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.zst nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 2fdabf30c99b..7ed6cd142d15 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.49"; + version = "3.12.50"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1vl8ghwhrs2sxd7kgi95nqlmf5k8ps0kr2lyly40ys262174i8lg"; + sha256 = "1bn07wsrcbg4qgqd4v2810c3qc0ifbcza0fyj8s54yd78g9qj4lj"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 88e100c7a4db..d75410d74d50 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { # TODO: Patch epoll so that the dbus actually responds # TODO: Figure out how to get privsep working, currently getting SIGBUS extraConfig = '' + CONFIG_AP=y CONFIG_LIBNL32=y CONFIG_EAP_FAST=y CONFIG_EAP_PWD=y |