diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-07 00:31:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-07 00:31:00 -0700 |
| commit | e587d3e155981aaca5c957a2ef0f49d792572eba (patch) | |
| tree | 04b731ae47d6a5a5ad6d8d1ea39bf1de7b37a50c /pkgs/os-specific | |
| parent | 76483363d128007771673b73a6490cb001816e86 (diff) | |
| parent | afd532f7cbd7be568648d72f7117341194c7861e (diff) | |
| download | nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.tar nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.tar.gz nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.tar.bz2 nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.tar.lz nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.tar.xz nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.tar.zst nixlib-e587d3e155981aaca5c957a2ef0f49d792572eba.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 8 |
1 files changed, 4 insertions, 4 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 8ab80ee1e4d0..dc166da3ae1d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-05-13"; + version = "2015-06-30"; src = fetchgit { - url = "http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c"; - sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq"; + url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git"; + rev = "ea901a57054441907e9b127ad407a8554532f992"; + sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67"; }; preInstall = '' |