Merge pull request #32340 from oxij/pkg/linux-firmware
firmware-linux-nonfree: update
This commit is contained in:
commit
29d5f2d979
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "firmware-linux-nonfree-${version}";
|
name = "firmware-linux-nonfree-${version}";
|
||||||
version = "2017-10-09-${src.iwlRev}";
|
version = "2017-10-13-${src.iwlRev}";
|
||||||
|
|
||||||
# The src runCommand automates the process of building a merged repository of both
|
# The src runCommand automates the process of building a merged repository of both
|
||||||
#
|
#
|
||||||
# http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
|
# https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
|
||||||
# http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
|
# https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
|
||||||
#
|
#
|
||||||
# This gives us up to date iwlwifi firmware as well as
|
# This gives us up to date iwlwifi firmware as well as
|
||||||
# the usual set of firmware. firmware/linux-firmware usually lags kernel releases
|
# the usual set of firmware. firmware/linux-firmware usually lags kernel releases
|
||||||
|
@ -17,15 +17,21 @@ stdenv.mkDerivation rec {
|
||||||
# update version to the more recent commit date
|
# update version to the more recent commit date
|
||||||
|
|
||||||
src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
|
src = runCommand "firmware-linux-nonfree-src-merged-${version}" {
|
||||||
# When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
|
shallowSince = "2017-10-01";
|
||||||
baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30";
|
baseRev = "85313b4aa4ef0c2ce41bbd0ffdb9b03363256f28";
|
||||||
iwlRev = "iwlwifi-fw-2017-11-03";
|
iwlRev = "iwlwifi-fw-2017-11-15";
|
||||||
|
|
||||||
|
# When updating this, you need to let it run with a wrong hash, in order to find out the desired hash
|
||||||
# randomly mutate the hash to break out of fixed hash, when updating
|
# randomly mutate the hash to break out of fixed hash, when updating
|
||||||
outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z";
|
outputHash = "0kpg1xmx5mjnqxv5n21yvvq4sl59yjpwjv9ficd054544q1v2jly";
|
||||||
|
|
||||||
outputHashAlgo = "sha256";
|
outputHashAlgo = "sha256";
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
|
|
||||||
|
# Doing the download on a remote machine just duplicates network
|
||||||
|
# traffic, so don't do that.
|
||||||
|
preferLocalBuild = true;
|
||||||
|
|
||||||
buildInputs = [ git gnupg ];
|
buildInputs = [ git gnupg ];
|
||||||
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
} ''
|
} ''
|
||||||
|
@ -33,12 +39,12 @@ stdenv.mkDerivation rec {
|
||||||
cd src
|
cd src
|
||||||
git config user.email "build-daemon@nixos.org"
|
git config user.email "build-daemon@nixos.org"
|
||||||
git config user.name "Nixos Build Daemon $name"
|
git config user.name "Nixos Build Daemon $name"
|
||||||
git remote add base git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
|
git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
|
||||||
git remote add iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
|
git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
|
||||||
git fetch base $baseRev
|
git fetch --shallow-since=$shallowSince base
|
||||||
git checkout -b work FETCH_HEAD
|
git fetch --shallow-since=$shallowSince iwl
|
||||||
git fetch iwl $iwlRev
|
git checkout -b work $baseRev
|
||||||
git merge FETCH_HEAD)
|
git merge $iwlRev)
|
||||||
rm -rf src/.git
|
rm -rf src/.git
|
||||||
cp -a src $out
|
cp -a src $out
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue