pyrox.dev
Merge pull request #32340 from oxij/pkg/linux-firmware
firmware-linux-nonfree: update
authored by
Jörg Thalheim
and committed by
GitHub
29d5f2d9
c9a03d9b
+19
-13
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+19
-13
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "firmware-linux-nonfree-${version}";
5
-
version = "2017-10-09-${src.iwlRev}";
5
+
version = "2017-10-13-${src.iwlRev}";
6
6
7
7
# The src runCommand automates the process of building a merged repository of both
8
8
#
9
-
# http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
10
-
# http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
9
+
# https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
10
+
# https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
11
11
#
12
12
# This gives us up to date iwlwifi firmware as well as
13
13
# the usual set of firmware. firmware/linux-firmware usually lags kernel releases
···
17
17
# update version to the more recent commit date
18
18
19
19
src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
20
-
# When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
21
-
baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30";
22
-
iwlRev = "iwlwifi-fw-2017-11-03";
20
+
shallowSince = "2017-10-01";
21
+
baseRev = "85313b4aa4ef0c2ce41bbd0ffdb9b03363256f28";
22
+
iwlRev = "iwlwifi-fw-2017-11-15";
23
23
24
+
# When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
24
25
# randomly mutate the hash to break out of fixed hash, when updating
25
-
outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z";
26
+
outputHash = "0kpg1xmx5mjnqxv5n21yvvq4sl59yjpwjv9ficd054544q1v2jly";
26
27
27
28
outputHashAlgo = "sha256";
28
29
outputHashMode = "recursive";
30
+
31
+
# Doing the download on a remote machine just duplicates network
32
+
# traffic, so don't do that.
33
+
preferLocalBuild = true;
34
+
29
35
buildInputs = [ git gnupg ];
30
36
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
31
37
} ''
···
33
39
cd src
34
40
git config user.email "build-daemon@nixos.org"
35
41
git config user.name "Nixos Build Daemon $name"
36
-
git remote add base git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
37
-
git remote add iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
38
-
git fetch base $baseRev
39
-
git checkout -b work FETCH_HEAD
40
-
git fetch iwl $iwlRev
41
-
git merge FETCH_HEAD)
42
+
git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
43
+
git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
44
+
git fetch --shallow-since=$shallowSince base
45
+
git fetch --shallow-since=$shallowSince iwl
46
+
git checkout -b work $baseRev
47
+
git merge $iwlRev)
42
48
rm -rf src/.git
43
49
cp -a src $out
44
50
'';