firmware-linux-nonfree: 2017-07-05 -> 2017-10-09-iwlwifi-fw-2017-11-03

- update and automate merging

The automated merging process should eliminate the need for keeping a
nixos-specific merged repository around

fixes #29806
This commit is contained in:
Herwig Hochleitner 2017-10-13 11:35:12 +02:00 committed by Herwig Hochleitner
parent fc22a0160e
commit 8ba0b7bc3b

View file

@ -1,22 +1,47 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchgit, runCommand, git, cacert, gnupg }:
stdenv.mkDerivation rec {
name = "firmware-linux-nonfree-${version}";
version = "2017-07-05";
version = "2017-10-09-${src.iwlRev}";
# This repo is built by merging the latest versions of
# 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/
# 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
#
# 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 = "fpletz";
repo = "linux-firmware";
rev = version;
sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if";
};
#
# To update, go to the above repositories and look for latest tags / commits, then
# update version to the more recent commit date
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
baseRev = "bf04291309d3169c0ad3b8db52564235bbd08e30";
iwlRev = "iwlwifi-fw-2017-11-03";
# randomly mutate the hash to break out of fixed hash, when updating
outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
buildInputs = [ git gnupg ];
NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
} ''
git init src && (
cd src
git config user.email "build-daemon@nixos.org"
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 iwl git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git
git fetch base $baseRev
git checkout -b work FETCH_HEAD
git fetch iwl $iwlRev
git merge FETCH_HEAD)
rm -rf src/.git
cp -a src $out
'';
preInstall = ''
mkdir -p $out