diff options
Diffstat (limited to 'pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index bbe35fe9699..259c5acdf87 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,13 +1,21 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-07-12"; + version = "2015-07-23"; - src = fetchgit { - url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git"; - rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf"; - sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49"; + # This repo is built by merging the latest versions of + # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ + # and + # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/ + # for any given date. This gives us up to date iwlwifi firmware as well as + # the usual set of firmware. firmware/linux-firmware usually lags kernel releases + # so iwlwifi cards will fail to load on newly released kernels. + src = fetchFromGitHub { + owner = "wkennington"; + repo = "linux-firmware"; + rev = "854b7f33e839ceea41034b45d6f755ea70c85486"; + sha256 = "1hhqvb96adk64ljf6hp5qss8fhpic28y985gbggh5p2w9bsgs5zq"; }; preInstall = '' |