git log -p -n100 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit e12d0b0d159715c8720a975dd2f23be3df21b097 | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Wed Jan 29 03:20:58 2020 +0100 | |
| firmwareLinuxNonfree: 2019-12-15 -> 2020-01-22 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 6e535cce898..1a454cb8957 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| pname = "firmware-linux-nonfree"; | |
| - version = "2019-12-15"; | |
| + version = "2020-01-22"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| rev = lib.replaceStrings ["-"] [""] version; | |
| - sha256 = "01zwmgva2263ksssqhhi46jh5kzb6z1a4xs8agsb2mbwifxf84cl"; | |
| + sha256 = "0256p99bqwf1d1s6gqnzpjcdmg6skcp1jzz64sd1p29xxrf0pzfa"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1jp2bb87jbcml1q3r4yilf9l3pirr19zb70l6mlxlmbqml50zwzd"; | |
| + outputHash = "1d2jvy395jpfq0gli7q5p571lcb9p5y0y8qr8p8rlcmczh4gry64"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 139c18dc66ac64855111848e66c2869169fc0101 | |
| Author: Michael Hoang <enzime@users.noreply.github.com> | |
| Date: Tue Dec 24 23:39:50 2019 +1100 | |
| firmware-linux-nonfree: 2019-10-22 -> 2019-12-15 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 8db9d4fb3b5..6e535cce898 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| pname = "firmware-linux-nonfree"; | |
| - version = "2019-10-22"; | |
| + version = "2019-12-15"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| rev = lib.replaceStrings ["-"] [""] version; | |
| - sha256 = "03ycc55h7vgd4fmb7v7gl7lplf7pg7acs16aa2rramgldxqvyx7j"; | |
| + sha256 = "01zwmgva2263ksssqhhi46jh5kzb6z1a4xs8agsb2mbwifxf84cl"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "15nm0xh2xq8mnk7a66iljcklc15gvh6jcpz2d9llg1fkv6w8lqc6"; | |
| + outputHash = "1jp2bb87jbcml1q3r4yilf9l3pirr19zb70l6mlxlmbqml50zwzd"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 6badf4507955868bd2c903f16537e6ec5a499838 | |
| Author: Doron Behar <doron.behar@gmail.com> | |
| Date: Mon Oct 28 16:22:48 2019 +0200 | |
| firmwareLinuxNonfree: 2019-09-23 -> 2019-10-22 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 3b5867837bd..8db9d4fb3b5 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,13 +1,13 @@ | |
| -{ stdenv, fetchgit }: | |
| +{ stdenv, fetchgit, lib }: | |
| stdenv.mkDerivation rec { | |
| pname = "firmware-linux-nonfree"; | |
| - version = "2019-09-23"; | |
| + version = "2019-10-22"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "20190923"; | |
| - sha256 = "1gq55ny6lb2nh6rr1w55bslzysyj0bwdl6rbpv882hhyjrnsma0n"; | |
| + rev = lib.replaceStrings ["-"] [""] version; | |
| + sha256 = "03ycc55h7vgd4fmb7v7gl7lplf7pg7acs16aa2rramgldxqvyx7j"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1y2z3wxqq2km6x08kfdqgcr9xczbq1h2jqyrqr6h31bapjb8x0k9"; | |
| + outputHash = "15nm0xh2xq8mnk7a66iljcklc15gvh6jcpz2d9llg1fkv6w8lqc6"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit bb978d818431a40a8818c1fd675f7c6fd27de132 | |
| Author: Michael Hoang <enzime@users.noreply.github.com> | |
| Date: Wed Oct 9 13:01:02 2019 +1100 | |
| firmware-linux-nonfree: 2019-08-15 -> 2019-09-23 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index a6e3ccad501..3b5867837bd 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| pname = "firmware-linux-nonfree"; | |
| - version = "2019-08-15"; | |
| + version = "2019-09-23"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "20190815"; | |
| - sha256 = "06p6scpmhdifzi3yhg5n4f2kqp4pl20xhh0k2kw70p10zgxg2l4r"; | |
| + rev = "20190923"; | |
| + sha256 = "1gq55ny6lb2nh6rr1w55bslzysyj0bwdl6rbpv882hhyjrnsma0n"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1dgclb44li70z0vkk9qxlbsj2jnqwx97gd7c429i2nv9lhgm14vx"; | |
| + outputHash = "1y2z3wxqq2km6x08kfdqgcr9xczbq1h2jqyrqr6h31bapjb8x0k9"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 6bbf9dc419c39189520ce5bcc68f2b071e71557d | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Tue Sep 17 23:34:07 2019 +0200 | |
| firmwareLinuxNonfree: 2019-07-17 -> 2019-08-15 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 380444f0269..a6e3ccad501 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| pname = "firmware-linux-nonfree"; | |
| - version = "2019-07-17"; | |
| + version = "2019-08-15"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "20190717"; | |
| - sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; | |
| + rev = "20190815"; | |
| + sha256 = "06p6scpmhdifzi3yhg5n4f2kqp4pl20xhh0k2kw70p10zgxg2l4r"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid"; | |
| + outputHash = "1dgclb44li70z0vkk9qxlbsj2jnqwx97gd7c429i2nv9lhgm14vx"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 | |
| Author: volth <volth@volth.com> | |
| Date: Thu Aug 15 12:41:18 2019 +0000 | |
| treewide: name -> pname (easy cases) (#66585) | |
| treewide replacement of | |
| stdenv.mkDerivation rec { | |
| name = "*-${version}"; | |
| version = "*"; | |
| to pname | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index c251e3963e7..380444f0269 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,7 +1,7 @@ | |
| { stdenv, fetchgit }: | |
| stdenv.mkDerivation rec { | |
| - name = "firmware-linux-nonfree-${version}"; | |
| + pname = "firmware-linux-nonfree"; | |
| version = "2019-07-17"; | |
| src = fetchgit { | |
| commit 05570075d7a3f9b6ccb9d0358a646477781045bb | |
| Author: Edmund Wu <fangkazuto@gmail.com> | |
| Date: Wed Jul 17 15:17:15 2019 -0400 | |
| firmwareLinuxNonfree: 2019-04-16 -> 2019-07-17 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index a1a15bab0fe..c251e3963e7 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2019-04-16"; | |
| + version = "2019-07-17"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "20190416"; | |
| - sha256 = "1grsxch5x65piqm8zswa7za3zccwxk0sxdm5qpgidmmq729xq3py"; | |
| + rev = "20190717"; | |
| + sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1fh6gwdx4paswhpyx8z43kf41l9svicp6ji06pdfhsnbx2l859zi"; | |
| + outputHash = "1q3zqa3xxg4679p893xzwpa43afvdnnkg5xb0qs6mac75sizngid"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit e50c71b3b1bee9109f1c9f27fe5cf511ff76d85e | |
| Author: Will Dietz <w@wdtz.org> | |
| Date: Tue Apr 16 08:58:42 2019 -0500 | |
| firmwareLinuxNonfree: 20190312 -> 20190416 | |
| restore outputHash attributes, since I already have them... | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index ee0a02763d1..a1a15bab0fe 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2019-03-12"; | |
| + version = "2019-04-16"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "20190312"; | |
| - sha256 = "1wk8l75rg7idvsyli29a1fii4xwz3vnm8d65fjw8d3azihdrhbyy"; | |
| + rev = "20190416"; | |
| + sha256 = "1grsxch5x65piqm8zswa7za3zccwxk0sxdm5qpgidmmq729xq3py"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { | |
| # Firmware blobs do not need fixing and should not be modified | |
| dontFixup = true; | |
| + outputHashMode = "recursive"; | |
| + outputHashAlgo = "sha256"; | |
| + outputHash = "1fh6gwdx4paswhpyx8z43kf41l9svicp6ji06pdfhsnbx2l859zi"; | |
| + | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| commit 72a6438f37104ae865e21f6f4a62d37f10cdb893 | |
| Author: Herwig Hochleitner <herwig@bendlas.net> | |
| Date: Fri Feb 1 04:47:56 2019 +0100 | |
| firmware-linux-nonfree: 2019-02-13 -> 2019-03-12 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index df917888dc7..ee0a02763d1 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2019-02-13"; | |
| + version = "2019-03-12"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "710963fe53ee3f227556d36839df3858daf6e232"; | |
| - sha256 = "1q3jvlqqxba08s2mrh9hwl0d5w6nhkwj63j0m6amxqpf10k49jxp"; | |
| + rev = "20190312"; | |
| + sha256 = "1wk8l75rg7idvsyli29a1fii4xwz3vnm8d65fjw8d3azihdrhbyy"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { | |
| # Firmware blobs do not need fixing and should not be modified | |
| dontFixup = true; | |
| - outputHashMode = "recursive"; | |
| - outputHashAlgo = "sha256"; | |
| - outputHash = "13gqnr6gm7336pm48v5p37clphwwdmgbrcipsg3w44wdwgc7fa2f"; | |
| - | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| commit b9ac4c1dd3146dad7a093819e640601d15af3de0 | |
| Author: Andreas Rammhold <andreas@rammhold.de> | |
| Date: Tue Feb 19 22:59:35 2019 +0100 | |
| firmwareLinuxNonfree: 2018-12-13 -> 2019-02-13 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 57135bf515b..df917888dc7 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2018-12-13"; | |
| + version = "2019-02-13"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "813fa1fc6fba6638decd974c4a6a2e485069ea15"; | |
| - sha256 = "0zspisbrvplgz1plk4ya22h7ilnsk60srk4q38h6n5d18fpn7rdw"; | |
| + rev = "710963fe53ee3f227556d36839df3858daf6e232"; | |
| + sha256 = "1q3jvlqqxba08s2mrh9hwl0d5w6nhkwj63j0m6amxqpf10k49jxp"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1yr6wcvc3s97h4w0qapma4l17dqsj175an6kmn5w6dppz19g0r5b"; | |
| + outputHash = "13gqnr6gm7336pm48v5p37clphwwdmgbrcipsg3w44wdwgc7fa2f"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 374a672424f9407ac5c3f66578e42b7fa8775c34 | |
| Author: Lengyel Balazs <ikervagyok@gmail.com> | |
| Date: Sun Dec 16 00:18:39 2018 +0100 | |
| firmware-linux-nonfree: 20181017 -> 20181213 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 43747aeaf0d..57135bf515b 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2018-10-17"; | |
| + version = "2018-12-13"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "de9cefa74bba6fce3834144460868a468b8818f2"; | |
| - sha256 = "101j4jk3ixl8r3mxbkcrr5ybhb44ij3l52js4dqfxpylpiaw2cgk"; | |
| + rev = "813fa1fc6fba6638decd974c4a6a2e485069ea15"; | |
| + sha256 = "0zspisbrvplgz1plk4ya22h7ilnsk60srk4q38h6n5d18fpn7rdw"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1ndwp9yhpmx0kzayddy9i93mpv3d8gxypqm85069ic13lrjz1gdf"; | |
| + outputHash = "1yr6wcvc3s97h4w0qapma4l17dqsj175an6kmn5w6dppz19g0r5b"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 788d32420506f691f05009be2a4fe5e99a3fc499 | |
| Author: Will Dietz <w@wdtz.org> | |
| Date: Wed Oct 17 18:49:53 2018 -0500 | |
| linux-firmware: 2018-08-25 -> 2018-10-17 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 82978d3e3ca..43747aeaf0d 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2018-08-25"; | |
| + version = "2018-10-17"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "fea76a04f25fd0a217c0d566ff5ff8f23ad3e648"; | |
| - sha256 = "1xy1s9vd7jny4hf4f1hzhlbnm0l4pnw7xycky0v6kfwlg5nnjii5"; | |
| + rev = "de9cefa74bba6fce3834144460868a468b8818f2"; | |
| + sha256 = "101j4jk3ixl8r3mxbkcrr5ybhb44ij3l52js4dqfxpylpiaw2cgk"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "1p1dkzclj718w7di81s6486dn5zw77c4i2qn63bvp9q4vid452hn"; | |
| + outputHash = "1ndwp9yhpmx0kzayddy9i93mpv3d8gxypqm85069ic13lrjz1gdf"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit a1017704c2b565ab868d7ff946e871b1af6b7080 | |
| Author: ash lea <ashlea@protonmail.com> | |
| Date: Sat Sep 1 03:15:13 2018 -0400 | |
| firmware-linux-nonfree: 2018-03-20 -> 2018-08-25 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 47fe2e446c3..82978d3e3ca 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2018-03-20"; | |
| + version = "2018-08-25"; | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "8c1e439c967a50f0698d61aafdba3841aff10db0"; | |
| - sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd"; | |
| + rev = "fea76a04f25fd0a217c0d566ff5ff8f23ad3e648"; | |
| + sha256 = "1xy1s9vd7jny4hf4f1hzhlbnm0l4pnw7xycky0v6kfwlg5nnjii5"; | |
| }; | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { | |
| outputHashMode = "recursive"; | |
| outputHashAlgo = "sha256"; | |
| - outputHash = "0r2g91hc7csp2fbp2ny4s4rwv0mw2m130gpnisxnhzi05hkwki66"; | |
| + outputHash = "1p1dkzclj718w7di81s6486dn5zw77c4i2qn63bvp9q4vid452hn"; | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| commit 0282f0d285b853d9f196fcdb61c616220200184f | |
| Author: volth <volth@webmaster.ms> | |
| Date: Tue Aug 7 13:54:27 2018 +0000 | |
| firmware-linux-nonfree: fixed-output derivation (#44605) | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 47d56cbf796..47fe2e446c3 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { | |
| sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd"; | |
| }; | |
| - preInstall = '' | |
| - mkdir -p $out | |
| - ''; | |
| - | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| # Firmware blobs do not need fixing and should not be modified | |
| dontFixup = true; | |
| + outputHashMode = "recursive"; | |
| + outputHashAlgo = "sha256"; | |
| + outputHash = "0r2g91hc7csp2fbp2ny4s4rwv0mw2m130gpnisxnhzi05hkwki66"; | |
| + | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| commit 52f53c69ce6dbc5538f7e4cd22f9d93baf1f64a2 | |
| Author: volth <volth@volth.com> | |
| Date: Sat Jul 21 00:44:44 2018 +0000 | |
| pkgs/*: remove unreferenced function arguments | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 724498b960c..47d56cbf796 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,4 +1,4 @@ | |
| -{ stdenv, fetchgit, runCommand, git, cacert, gnupg }: | |
| +{ stdenv, fetchgit }: | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| commit fccddb25560fa3e35a0cd9e921a212d651ba19a5 | |
| Author: Corey O'Connor <coreyoconnor@gmail.com> | |
| Date: Tue Apr 3 22:00:12 2018 -0700 | |
| firmware-linux-nonfree: Update SHA and add rev to prevent breakage on future commits. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 206787ecb8b..724498b960c 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { | |
| src = fetchgit { | |
| url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - sha256 = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma"; | |
| + rev = "8c1e439c967a50f0698d61aafdba3841aff10db0"; | |
| + sha256 = "110vxgahyx5dvylqrxsm5cmx4a32cl2zchvm6cgc270jz75fg7wd"; | |
| }; | |
| preInstall = '' | |
| commit ecf5caf457331ca777f498a94dea34e9befac028 | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Wed Mar 28 02:12:01 2018 +0200 | |
| firmwareLinuxNonfree: simplify source fetching | |
| The iwlwifi repo has been merged into linux-firmware. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index dc2a5278fdc..206787ecb8b 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,51 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2018-03-20-${src.iwlRev}"; | |
| + version = "2018-03-20"; | |
| - # The src runCommand automates the process of building a merged repository of both | |
| - # | |
| - # https://git.kernel.org/cgit/linux/kernel/git/firmware/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 | |
| - # the usual set of firmware. firmware/linux-firmware usually lags kernel releases | |
| - # so iwlwifi cards will fail to load on newly released kernels. | |
| - # | |
| - # 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}" { | |
| - shallowSince = "2017-10-01"; | |
| - baseRev = "44476f2465dac9c22bce90da66e86b2b56ba34f0"; | |
| - iwlRev = "iwlwifi-fw-2018-03-02"; | |
| - | |
| - # 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 | |
| - outputHash = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma"; | |
| - | |
| - outputHashAlgo = "sha256"; | |
| - outputHashMode = "recursive"; | |
| - | |
| - # Doing the download on a remote machine just duplicates network | |
| - # traffic, so don't do that. | |
| - preferLocalBuild = true; | |
| - | |
| - nativeBuildInputs = [ cacert git gnupg ]; | |
| - } '' | |
| - 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 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git | |
| - git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git | |
| - git fetch --shallow-since=$shallowSince base | |
| - git fetch --shallow-since=$shallowSince iwl | |
| - git checkout -b work $baseRev | |
| - git merge $iwlRev) | |
| - rm -rf src/.git | |
| - cp -a src $out | |
| - ''; | |
| + src = fetchgit { | |
| + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| + sha256 = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma"; | |
| + }; | |
| preInstall = '' | |
| mkdir -p $out | |
| commit c787555b94329ded65ef274e6763b616a59c77fc | |
| Author: Will Dietz <w@wdtz.org> | |
| Date: Tue Mar 27 13:05:40 2018 -0500 | |
| firmwareLinuxNonfree: 2018-01-04 -> 2018-03-20 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index acdba5987bb..dc2a5278fdc 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2018-01-04-${src.iwlRev}"; | |
| + version = "2018-03-20-${src.iwlRev}"; | |
| # The src runCommand automates the process of building a merged repository of both | |
| # | |
| @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { | |
| src = runCommand "firmware-linux-nonfree-src-merged-${version}" { | |
| shallowSince = "2017-10-01"; | |
| - baseRev = "65b1c68c63f974d72610db38dfae49861117cae2"; | |
| - iwlRev = "iwlwifi-fw-2017-11-15"; | |
| + baseRev = "44476f2465dac9c22bce90da66e86b2b56ba34f0"; | |
| + iwlRev = "iwlwifi-fw-2018-03-02"; | |
| # 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 | |
| - outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz"; | |
| + outputHash = "1gh5a2km33jj151j3q7mgkjzzhaaxlqxbb53n4ff46q658gv0wma"; | |
| outputHashAlgo = "sha256"; | |
| outputHashMode = "recursive"; | |
| commit 6ed0fe7e450def967685ec11b789bfe32002d1c1 | |
| Merge: c08042ba4b5 b986078593a | |
| Author: Tuomas Tynkkynen <tuomas@tuxera.com> | |
| Date: Sun Jan 14 21:18:27 2018 +0200 | |
| Merge remote-tracking branch 'upstream/master' into staging | |
| Conflicts: | |
| pkgs/build-support/fetchbower/default.nix | |
| pkgs/build-support/fetchdarcs/default.nix | |
| pkgs/build-support/fetchgx/default.nix | |
| pkgs/development/python-modules/botocore/default.nix | |
| pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| pkgs/tools/admin/awscli/default.nix | |
| commit 888404f11bfd0c1b60904590aad56ca70e5f6d9d | |
| Author: John Ericson <John.Ericson@Obsidian.Systems> | |
| Date: Tue Jan 9 19:27:23 2018 -0500 | |
| treewide: Fix deps in a few other fixed output derivations | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 809d0ba5264..206ea01bb20 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { | |
| # traffic, so don't do that. | |
| preferLocalBuild = true; | |
| - buildInputs = [ git gnupg ]; | |
| + nativeBuildInputs = [ git gnupg ]; | |
| NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; | |
| } '' | |
| git init src && ( | |
| commit 5a02143c206e8658e6e79047a6db206ace36f22d | |
| Merge: 84f97360140 091c2b9f041 | |
| Author: Daiderd Jordan <daiderd@gmail.com> | |
| Date: Sun Jan 7 09:55:15 2018 +0100 | |
| Merge pull request #33010 from LnL7/cacert-hook | |
| cacert: add hook that sets SSL_CERT_FILE | |
| commit c01cfb9e01c6925034119e7e027720e306e9043b | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Fri Jan 5 02:32:17 2018 +0100 | |
| firmware-linux-nonfree: 2017-12-06 -> 2018-01-04 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 0044a3f6f4a..809d0ba5264 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2017-12-06-${src.iwlRev}"; | |
| + version = "2018-01-04-${src.iwlRev}"; | |
| # The src runCommand automates the process of building a merged repository of both | |
| # | |
| @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { | |
| src = runCommand "firmware-linux-nonfree-src-merged-${version}" { | |
| shallowSince = "2017-10-01"; | |
| - baseRev = "7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3"; | |
| + baseRev = "65b1c68c63f974d72610db38dfae49861117cae2"; | |
| 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 | |
| - outputHash = "007ncka33vkyaxnih3a36w5pnhn19wdzjl95ig7lhznzvf1bnc1w"; | |
| + outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz"; | |
| outputHashAlgo = "sha256"; | |
| outputHashMode = "recursive"; | |
| @@ -55,12 +55,15 @@ stdenv.mkDerivation rec { | |
| installFlags = [ "DESTDIR=$(out)" ]; | |
| + # Firmware blobs do not need fixing and should not be modified | |
| + dontFixup = true; | |
| + | |
| meta = with stdenv.lib; { | |
| description = "Binary firmware collection packaged by kernel.org"; | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| license = licenses.unfreeRedistributableFirmware; | |
| platforms = platforms.linux; | |
| - maintainers = with maintainers; [ wkennington fpletz ]; | |
| + maintainers = with maintainers; [ fpletz ]; | |
| priority = 6; # give precedence to kernel firmware | |
| }; | |
| commit 091c2b9f04189301f18ff0bc8336541d137f1d61 | |
| Author: Daiderd Jordan <daiderd@gmail.com> | |
| Date: Wed Dec 27 21:26:36 2017 +0100 | |
| cacert: cleanup exporting SSL_CERT_FILE | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 0044a3f6f4a..3bd03d7b40c 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { | |
| # traffic, so don't do that. | |
| preferLocalBuild = true; | |
| - buildInputs = [ git gnupg ]; | |
| - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; | |
| + buildInputs = [ cacert git gnupg ]; | |
| } '' | |
| git init src && ( | |
| cd src | |
| commit 4fcae79002b9201f12b789a737042bb45b88c061 | |
| Author: Bastian Köcher <git@kchr.de> | |
| Date: Wed Dec 13 21:53:11 2017 +0100 | |
| firmware-linux-nonfree: 2017-10-09-iwlwifi-fw-2017-11-03 -> 2017-12-06-iwlwifi-fw-2017-11-15 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index b2aa1937112..0044a3f6f4a 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2017-10-13-${src.iwlRev}"; | |
| + version = "2017-12-06-${src.iwlRev}"; | |
| # The src runCommand automates the process of building a merged repository of both | |
| # | |
| @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { | |
| src = runCommand "firmware-linux-nonfree-src-merged-${version}" { | |
| shallowSince = "2017-10-01"; | |
| - baseRev = "85313b4aa4ef0c2ce41bbd0ffdb9b03363256f28"; | |
| + baseRev = "7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3"; | |
| 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 | |
| - outputHash = "0kpg1xmx5mjnqxv5n21yvvq4sl59yjpwjv9ficd054544q1v2jly"; | |
| + outputHash = "007ncka33vkyaxnih3a36w5pnhn19wdzjl95ig7lhznzvf1bnc1w"; | |
| outputHashAlgo = "sha256"; | |
| outputHashMode = "recursive"; | |
| commit d43b41fd5e4aca72630079cf0e8beb0a4e48c70d | |
| Author: Jan Malakhovski <oxij@oxij.org> | |
| Date: Tue Dec 5 11:46:43 2017 +0000 | |
| firmware-linux-nonfree: 2017-10-09-iwlwifi-fw-2017-11-03 -> 2017-10-13-iwlwifi-fw-2017-11-15 | |
| Also switch to https for privacy and use shallow fetches to save on network bandwidth. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index bbacd615cf2..b2aa1937112 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| 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 | |
| # | |
| - # http://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/firmware/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 | |
| # 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 | |
| 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"; | |
| + shallowSince = "2017-10-01"; | |
| + baseRev = "85313b4aa4ef0c2ce41bbd0ffdb9b03363256f28"; | |
| + 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 | |
| - outputHash = "11izv1vpq9ixlqdss19lzs5q289d7jxr5kgf6iymk4alxznffd8z"; | |
| + outputHash = "0kpg1xmx5mjnqxv5n21yvvq4sl59yjpwjv9ficd054544q1v2jly"; | |
| outputHashAlgo = "sha256"; | |
| outputHashMode = "recursive"; | |
| + | |
| + # Doing the download on a remote machine just duplicates network | |
| + # traffic, so don't do that. | |
| + preferLocalBuild = true; | |
| + | |
| buildInputs = [ git gnupg ]; | |
| NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; | |
| } '' | |
| @@ -33,12 +39,12 @@ stdenv.mkDerivation rec { | |
| 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) | |
| + git remote add base https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git | |
| + git remote add iwl https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git | |
| + git fetch --shallow-since=$shallowSince base | |
| + git fetch --shallow-since=$shallowSince iwl | |
| + git checkout -b work $baseRev | |
| + git merge $iwlRev) | |
| rm -rf src/.git | |
| cp -a src $out | |
| ''; | |
| commit 8ba0b7bc3b7a0c359aced533295862e3b92ac9e8 | |
| Author: Herwig Hochleitner <herwig@bendlas.net> | |
| Date: Fri Oct 13 11:35:12 2017 +0200 | |
| 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 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 2f4689beea4..bbacd615cf2 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -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 | |
| commit e1b29dd6d6a9d3f17fdc60ea5d47b16746c16606 | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Wed Jul 5 18:59:59 2017 +0200 | |
| firmwareLinuxNonfree: 2017-04-16 -> 2017-07-05 | |
| Fixes #27129. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index b81c8f257b8..2f4689beea4 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2017-04-16"; | |
| + version = "2017-07-05"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { | |
| owner = "fpletz"; | |
| repo = "linux-firmware"; | |
| rev = version; | |
| - sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc"; | |
| + sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if"; | |
| }; | |
| preInstall = '' | |
| commit b733a34e8e5e0692e542ac631926dd425510406f | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Sun Apr 16 14:32:36 2017 +0200 | |
| firmwareLinuxNonfree: 2017-03-11 -> 2017-04-16 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 69f0a16785d..b81c8f257b8 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2017-03-11"; | |
| + version = "2017-04-16"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { | |
| owner = "fpletz"; | |
| repo = "linux-firmware"; | |
| rev = version; | |
| - sha256 = "05hz78z919jnacvk4i1mghjn2h15ph91vkffgi4w94zhzbf77cna"; | |
| + sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc"; | |
| }; | |
| preInstall = '' | |
| commit c3c69535aa9f18f611950655d2e8ffc82521943d | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Sat Mar 11 15:02:27 2017 +0100 | |
| firmwareLinuxNonfree: 2017-02-06 -> 2017-03-11 | |
| Fixes #22365. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index dcc52de7fe7..69f0a16785d 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2017-02-06"; | |
| + version = "2017-03-11"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { | |
| owner = "fpletz"; | |
| repo = "linux-firmware"; | |
| rev = version; | |
| - sha256 = "1r5ph97rqp8asw8kx65izb3p934669n2na20yfwplbsk76c9i82v"; | |
| + sha256 = "05hz78z919jnacvk4i1mghjn2h15ph91vkffgi4w94zhzbf77cna"; | |
| }; | |
| preInstall = '' | |
| commit 01cf43a3899443736b9f35ed7d45f781d2b58e4f | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Mon Feb 6 14:57:04 2017 +0100 | |
| firmwareLinuxNonfree: 2016-07-12 -> 2017-02-06 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 8e0f807e08e..dcc52de7fe7 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2016-07-12"; | |
| + version = "2017-02-06"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { | |
| # 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"; | |
| + owner = "fpletz"; | |
| repo = "linux-firmware"; | |
| - rev = "cccb6a0da98372bd66787710249727ad6b0aaf72"; | |
| - sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0"; | |
| + rev = version; | |
| + sha256 = "1r5ph97rqp8asw8kx65izb3p934669n2na20yfwplbsk76c9i82v"; | |
| }; | |
| preInstall = '' | |
| commit 039f0e5cb044a3610252f139283cef32850091e2 | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Tue Jul 19 07:54:30 2016 +0200 | |
| firmwareLinuxNonfree: 2016-05-18 -> 2016-07-12 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 992d42e2e12..8e0f807e08e 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2016-05-18"; | |
| + version = "2016-07-12"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { | |
| src = fetchFromGitHub { | |
| owner = "wkennington"; | |
| repo = "linux-firmware"; | |
| - rev = "19495832c6899bd811874439376d513290773c31"; | |
| - sha256 = "1700a24sfw6xa3q3r8aa5wfhydgix83m57plpfirdmc9qr4isrr0"; | |
| + rev = "cccb6a0da98372bd66787710249727ad6b0aaf72"; | |
| + sha256 = "1c7h8i37nbyy37zqhybxd3y6aqabfv4nrdkjg789w67mdnn6hka0"; | |
| }; | |
| preInstall = '' | |
| @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| license = licenses.unfreeRedistributableFirmware; | |
| platforms = platforms.linux; | |
| - maintainers = with maintainers; [ wkennington ]; | |
| + maintainers = with maintainers; [ wkennington fpletz ]; | |
| priority = 6; # give precedence to kernel firmware | |
| }; | |
| commit 4bbb5c7e4c87d924d9979c4882f20a4cd63f7cfe | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Mon Jun 13 13:48:57 2016 +0200 | |
| firmwareLinuxNonfree: 2016-01-26 -> 2016-05-18 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 98bf27d3c4a..992d42e2e12 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2016-01-26"; | |
| + version = "2016-05-18"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { | |
| src = fetchFromGitHub { | |
| owner = "wkennington"; | |
| repo = "linux-firmware"; | |
| - rev = "0922e78fc8431c2cc6585eb66e5b75f566644ac8"; | |
| - sha256 = "07hv4kgbsxndhm1va6k6scy083886aap3naq1l4jdz7dnph4ir02"; | |
| + rev = "19495832c6899bd811874439376d513290773c31"; | |
| + sha256 = "1700a24sfw6xa3q3r8aa5wfhydgix83m57plpfirdmc9qr4isrr0"; | |
| }; | |
| preInstall = '' | |
| commit de5a233a71213101ccb3e06bad6a33d088f9e7f9 | |
| Author: Franz Pletz <fpletz@fnordicwalking.de> | |
| Date: Sun Jan 31 14:31:58 2016 +0100 | |
| firmware-linux-nonfree: 2015-12-04 -> 2016-01-26 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 61ea6c0c18c..98bf27d3c4a 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-12-04"; | |
| + version = "2016-01-26"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { | |
| src = fetchFromGitHub { | |
| owner = "wkennington"; | |
| repo = "linux-firmware"; | |
| - rev = "bbe4917c054eb0a73e250c6363341e3bf6725839"; | |
| - sha256 = "1p9c74p8j8zmddljaan5i29h8wsbz8911dv2sykpnahg9r939ykd"; | |
| + rev = "0922e78fc8431c2cc6585eb66e5b75f566644ac8"; | |
| + sha256 = "07hv4kgbsxndhm1va6k6scy083886aap3naq1l4jdz7dnph4ir02"; | |
| }; | |
| preInstall = '' | |
| commit de68a492597c301fa668d25bbb4a5485200b5721 | |
| Author: zimbatm <zimbatm@zimbatm.com> | |
| Date: Fri Jan 29 18:16:59 2016 +0000 | |
| firmware-linux-nonfree: update to master | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 455088d8f5e..61ea6c0c18c 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-10-18"; | |
| + version = "2015-12-04"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { | |
| src = fetchFromGitHub { | |
| owner = "wkennington"; | |
| repo = "linux-firmware"; | |
| - rev = "f7694d34655a7f688033d0582f306b3f287b785d"; | |
| - sha256 = "0pb6pq48hfcny34l3anln9g4dy1f4n8gzmfib9pk4l64648sylnl"; | |
| + rev = "bbe4917c054eb0a73e250c6363341e3bf6725839"; | |
| + sha256 = "1p9c74p8j8zmddljaan5i29h8wsbz8911dv2sykpnahg9r939ykd"; | |
| }; | |
| preInstall = '' | |
| commit d03661b606bba4f43fd5df32e583a786886935e5 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Sun Oct 18 17:21:40 2015 -0700 | |
| linuxFirmware: 2015-09-07 -> 2015-10-18 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 9c4e0f3990c..455088d8f5e 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-09-07"; | |
| + version = "2015-10-18"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { | |
| src = fetchFromGitHub { | |
| owner = "wkennington"; | |
| repo = "linux-firmware"; | |
| - rev = "0c3ac7434235f57967df4046ceafc0e4a08bb139"; | |
| - sha256 = "1jhcgf0anjfi2998nzplr9l1q0b1yi306a2w1k2r4civsmfgm08r"; | |
| + rev = "f7694d34655a7f688033d0582f306b3f287b785d"; | |
| + sha256 = "0pb6pq48hfcny34l3anln9g4dy1f4n8gzmfib9pk4l64648sylnl"; | |
| }; | |
| preInstall = '' | |
| commit d51d63fcf1abcce18fb71f792b828aaeb6ac82bc | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Mon Sep 7 23:10:53 2015 -0700 | |
| linux-firmware: 2015-07-23 -> 2015-09-07 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index a995b193a84..9c4e0f3990c 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,7 +2,7 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-07-23"; | |
| + version = "2015-09-07"; | |
| # This repo is built by merging the latest versions of | |
| # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ | |
| @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { | |
| src = fetchFromGitHub { | |
| owner = "wkennington"; | |
| repo = "linux-firmware"; | |
| - rev = "854b7f33e839ceea41034b45d6f755ea70c85486"; | |
| - sha256 = "1hhqvb96adk64ljf6hp5qss8fhpic28y985gbggh5p2w9bsgs5zq"; | |
| + rev = "0c3ac7434235f57967df4046ceafc0e4a08bb139"; | |
| + sha256 = "1jhcgf0anjfi2998nzplr9l1q0b1yi306a2w1k2r4civsmfgm08r"; | |
| }; | |
| preInstall = '' | |
| commit e4610f2965c2ab60132344defa055792a658ea45 | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Tue Aug 25 00:37:54 2015 +0200 | |
| buildEnv: Support package priorities like nix-env | |
| This gets rid of a bunch of collision warnings. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 259c5acdf87..a995b193a84 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { | |
| license = licenses.unfreeRedistributableFirmware; | |
| platforms = platforms.linux; | |
| maintainers = with maintainers; [ wkennington ]; | |
| + priority = 6; # give precedence to kernel firmware | |
| }; | |
| passthru = { inherit version; }; | |
| commit 17b924bb9f2bf6f559619e5c02397b3d494e2cf7 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Wed Jul 22 12:33:27 2015 -0700 | |
| linux-firmware: 2015-07-12 -> 2015-07-23 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index bbe35fe9699..259c5acdf87 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ 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 = '' | |
| commit 52b78864a8ffd8ccf121dd207019b4dfaa6e48cd | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Mon Jul 13 23:53:13 2015 -0700 | |
| firmware-linux-nonfree: 2015-06-30 -> 2015-07-12 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index dc166da3ae1..bbe35fe9699 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-06-30"; | |
| + version = "2015-07-12"; | |
| src = fetchgit { | |
| url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git"; | |
| - rev = "ea901a57054441907e9b127ad407a8554532f992"; | |
| - sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67"; | |
| + rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf"; | |
| + sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49"; | |
| }; | |
| preInstall = '' | |
| commit 3cfc6fa38a1976b43f50b2956e27b454d2775149 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Mon Jul 6 18:31:03 2015 -0700 | |
| linux-firmware: 2015-05-13 -> 2015-06-30 | |
| Use iwlwifi/linux-firmware temporarily since the firmware for kernel | |
| 4.1+ is not mainlined in firmware/linux-firmware. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 8ab80ee1e4d..dc166da3ae1 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ 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 = '' | |
| commit 7639474c72ad4de310e0b86db088901021f25736 | |
| Author: Edward Tjörnhammar <ed@cflags.cc> | |
| Date: Mon May 18 21:06:35 2015 +0200 | |
| firmware-linux-nonfree.src: use http:// to enable better availability for proxied users | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index fa7af6a8c1b..8ab80ee1e4d 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { | |
| version = "2015-05-13"; | |
| src = fetchgit { | |
| - url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| + url = "http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c"; | |
| sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq"; | |
| }; | |
| commit d7af7fb504a7970d9ff6377274a084e7eaae8fc9 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Fri May 15 15:42:20 2015 -0700 | |
| firmware-linux-nonfree: 2015-03-20 -> 2015-05-13 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 6ac468774ad..fa7af6a8c1b 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-03-20"; | |
| + version = "2015-05-13"; | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "f404336ba808cbd57547196e13367079a23b822c"; | |
| - sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa"; | |
| + rev = "3161bfa479d5e9ed4f46b57df9bcecbbc4f8eb3c"; | |
| + sha256 = "0np6vwcnas3pzp38man3cs8j5ijs0p3skyzla19sfxzpwmjvfpjq"; | |
| }; | |
| preInstall = '' | |
| commit ace8dfa22cae9d3a4993d12c63384f1cb8d4059e | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Wed Mar 25 14:46:49 2015 -0700 | |
| linuxFirmwareNonfree: 3015-03-09 -> 2015-03-20 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 7c49685bab5..6ac468774ad 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -2,12 +2,12 @@ | |
| stdenv.mkDerivation rec { | |
| name = "firmware-linux-nonfree-${version}"; | |
| - version = "2015-03-09"; | |
| + version = "2015-03-20"; | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "020e534ec90106d42a890cd9d090b24e3d158c53"; | |
| - sha256 = "101mpps0jcv2dd4jh1w3j4h78d4iv8n8r1cnf4br2vg66zl3zg9v"; | |
| + rev = "f404336ba808cbd57547196e13367079a23b822c"; | |
| + sha256 = "0avz5vxax2b3s4gafib47vih1lbq78agdmpjcjnnnykw2kschkwa"; | |
| }; | |
| preInstall = '' | |
| commit 79827eb8f5dc8cc60880385fdb954c068b21673b | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Wed Mar 25 14:43:50 2015 -0700 | |
| firmware-linux-nonfree: Support version passthru | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index be3d6a997b3..7c49685bab5 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,7 +1,8 @@ | |
| { stdenv, fetchgit }: | |
| -stdenv.mkDerivation { | |
| - name = "firmware-linux-nonfree-2015-03-09"; | |
| +stdenv.mkDerivation rec { | |
| + name = "firmware-linux-nonfree-${version}"; | |
| + version = "2015-03-09"; | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| @@ -22,4 +23,6 @@ stdenv.mkDerivation { | |
| platforms = platforms.linux; | |
| maintainers = with maintainers; [ wkennington ]; | |
| }; | |
| + | |
| + passthru = { inherit version; }; | |
| } | |
| commit 73f3432fbbb9c58f63a6b8d5745327c6a34651ea | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Mon Mar 9 17:01:31 2015 -0700 | |
| firmware-linux-nonfree: 2015-02-27 -> 2015-03-09 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 06670b61b4b..be3d6a997b3 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,12 +1,12 @@ | |
| { stdenv, fetchgit }: | |
| stdenv.mkDerivation { | |
| - name = "firmware-linux-nonfree-2015-02-27"; | |
| + name = "firmware-linux-nonfree-2015-03-09"; | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "cef33368c4d3425f11306496f0250f8ef1cf3c1f"; | |
| - sha256 = "0az6b7fbhanqdc9v9dl651yqqnfbm1npdibip196vnmd5qlv2iw4"; | |
| + rev = "020e534ec90106d42a890cd9d090b24e3d158c53"; | |
| + sha256 = "101mpps0jcv2dd4jh1w3j4h78d4iv8n8r1cnf4br2vg66zl3zg9v"; | |
| }; | |
| preInstall = '' | |
| commit f311c156f502eb348bf0f216264c54ac1c9080ea | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Tue Mar 3 12:55:26 2015 -0800 | |
| linux-firmware-nonfree: 2015-02-24 -> 2015-02-27 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index e175fa423a1..06670b61b4b 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,12 +1,12 @@ | |
| { stdenv, fetchgit }: | |
| stdenv.mkDerivation { | |
| - name = "firmware-linux-nonfree-2015-02-24"; | |
| + name = "firmware-linux-nonfree-2015-02-27"; | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = "4517261caab34742afdeaf0c36128b9579675717"; | |
| - sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c"; | |
| + rev = "cef33368c4d3425f11306496f0250f8ef1cf3c1f"; | |
| + sha256 = "0az6b7fbhanqdc9v9dl651yqqnfbm1npdibip196vnmd5qlv2iw4"; | |
| }; | |
| preInstall = '' | |
| commit 7d5ab9a4d21ddc4667108a40654dc6394ee21236 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Wed Feb 25 11:52:56 2015 -0800 | |
| linux-firmware-nonfree: Use date instead of git version | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 77f55d07faf..e175fa423a1 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,15 +1,11 @@ | |
| { stdenv, fetchgit }: | |
| -let | |
| - version = "4517261caab34742afdeaf0c36128b9579675717"; | |
| - shortVersion = stdenv.lib.substring 0 7 version; | |
| -in | |
| stdenv.mkDerivation { | |
| - name = "firmware-linux-nonfree-${shortVersion}"; | |
| + name = "firmware-linux-nonfree-2015-02-24"; | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| - rev = version; | |
| + rev = "4517261caab34742afdeaf0c36128b9579675717"; | |
| sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c"; | |
| }; | |
| commit 4bbc0265940058b4b3289b195c5d7f001249aaab | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Tue Feb 24 14:14:01 2015 -0800 | |
| linux-firmware-nonfree: Update | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index b8a67b87a80..77f55d07faf 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,7 +1,7 @@ | |
| { stdenv, fetchgit }: | |
| let | |
| - version = "17657c35869baa999b454e868cd3d5a7e1656425"; | |
| + version = "4517261caab34742afdeaf0c36128b9579675717"; | |
| shortVersion = stdenv.lib.substring 0 7 version; | |
| in | |
| stdenv.mkDerivation { | |
| @@ -10,7 +10,7 @@ stdenv.mkDerivation { | |
| src = fetchgit { | |
| url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| rev = version; | |
| - sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb"; | |
| + sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c"; | |
| }; | |
| preInstall = '' | |
| commit 650b2258f06a191409ea94ea2360644587d0e330 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Mon Feb 9 16:28:37 2015 -0800 | |
| nonfree-firmware: Use the new kernel.org repository for tracking nonfree firmware changes | |
| remove the obsolete iwlwifi firmware which is included in the repo. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 78c1e857ebe..b8a67b87a80 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,72 +1,29 @@ | |
| -# The firmware bundle as packaged by Debian. This should be "all" firmware that is not shipped | |
| -# as part of the kernel itself. | |
| -# You can either install the complete bundle, or write a separate package for individual | |
| -# devices that copies the firmware from this package. | |
| - | |
| -{ stdenv, fetchurl, dpkg }: | |
| +{ stdenv, fetchgit }: | |
| let | |
| - version = "0.43"; | |
| - | |
| - packages = [ | |
| - { name = "adi"; sha256 = "13cwnbispivpd73k928l1i818ylhpahp6xh7d6pw59sswrsx6inw"; } | |
| - { name = "atheros"; sha256 = "0sw9d52k3ynx1cxg7cq49pmm8y6vlqyhb9843hbyf6nbmjqj72bx"; } | |
| - { name = "bnx2"; sha256 = "1r8scys27qj5shdbgl8ag9vi4hiidx4bp8yw4n4dcp288d9x7bbh"; } | |
| - { name = "bnx2x"; sha256 = "03jx4vnn8irlwswydf4h3ya1kf064jkaj67jry2hr6qwpd4l8pgq"; } | |
| - { name = "brcm80211"; sha256 = "01mkmjkg16kdd26pwlg4a1s1717fh0j602mwqhwh46k8zakg2lkh"; } | |
| - { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } | |
| - { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } | |
| - { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } | |
| - { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } | |
| - { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } | |
| - { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } | |
| - { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } | |
| - { name = "myricom"; sha256 = "17cdl885jlnja5m60l35xr2f84hv8z4cvg3d25vpp171s1vf1ks1"; } | |
| - { name = "netxen"; sha256 = "122nava9ld1v8gcnqbdpx0kffv0rxm9glp4xg09ssvldy4myfgl7"; } | |
| - { name = "qlogic"; sha256 = "02pgmprz1qwij7lw1lgmb8clgxj8v3mx0fyy1l4z7bffnpvip863"; } | |
| - { name = "ralink"; sha256 = "0yw9gf9gm3jxmsndr8kcsf6829smm88kshfb4c8jn0n6f4yy9l7x"; } | |
| - { name = "realtek"; sha256 = "0gay9x47pimdqj665sr1416l3bdyca9grsqpj0s9n6k1lmywrqx1"; } | |
| - { name = "ti-connectivity"; sha256 = "1m6yk0827991hs46l8pp8iiwh1ms0rwlmwn64k2wr725k5yzg29b"; } | |
| - ]; | |
| - | |
| - fetchPackage = | |
| - { name, sha256 }: fetchurl { | |
| - url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-${name}_${version}_all.deb"; | |
| - inherit sha256; | |
| - }; | |
| - | |
| - srcs = map fetchPackage packages; | |
| - | |
| -in stdenv.mkDerivation { | |
| - name = "firmware-linux-nonfree-${version}"; | |
| - inherit srcs; | |
| - | |
| - unpackPhase = '' | |
| - mkdir -p ./firmware | |
| - ''; | |
| + version = "17657c35869baa999b454e868cd3d5a7e1656425"; | |
| + shortVersion = stdenv.lib.substring 0 7 version; | |
| +in | |
| +stdenv.mkDerivation { | |
| + name = "firmware-linux-nonfree-${shortVersion}"; | |
| + | |
| + src = fetchgit { | |
| + url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; | |
| + rev = version; | |
| + sha256 = "15lv58wf3vjs4dpxvx3a7wn0pj83952wa2ab6ajfl3pbdhcvkzjb"; | |
| + }; | |
| - buildPhase = '' | |
| - for src in $srcs; do | |
| - dpkg-deb -W $src | |
| - dpkg-deb -x $src . | |
| - done | |
| + preInstall = '' | |
| + mkdir -p $out | |
| ''; | |
| - buildInputs = [ dpkg ]; | |
| - | |
| - installPhase = '' | |
| - mkdir -p $out/share $out/lib/firmware | |
| - cp -r lib/firmware/* "$out/lib/firmware/" | |
| - # iwlwifi is packaged separately, but we need Bluetooth fw | |
| - rm $out/lib/firmware/iwlwifi* | |
| - cp -r usr/share/doc $out/share/ | |
| - find $out/share -name changelog.gz | xargs rm | |
| - ''; | |
| + installFlags = [ "DESTDIR=$(out)" ]; | |
| - meta = { | |
| - description = "Binary firmware collection packaged by Debian"; | |
| + meta = with stdenv.lib; { | |
| + description = "Binary firmware collection packaged by kernel.org"; | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| - license = stdenv.lib.licenses.unfreeRedistributableFirmware; | |
| - platforms = stdenv.lib.platforms.linux; | |
| + license = licenses.unfreeRedistributableFirmware; | |
| + platforms = platforms.linux; | |
| + maintainers = with maintainers; [ wkennington ]; | |
| }; | |
| } | |
| commit c0d95c2f80a4a3b51e6ee589462c8634b14edd20 | |
| Author: Nikolay Amiantov <ab@fmap.me> | |
| Date: Fri Jan 2 18:10:11 2015 +0300 | |
| linux-firmware: add ibt-hw firmware | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 2868be73d39..78c1e857ebe 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -17,8 +17,7 @@ let | |
| { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } | |
| { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } | |
| { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } | |
| - # Disabled as it is packaged separately | |
| - #{ name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } | |
| + { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } | |
| { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } | |
| { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } | |
| { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } | |
| @@ -58,6 +57,8 @@ in stdenv.mkDerivation { | |
| installPhase = '' | |
| mkdir -p $out/share $out/lib/firmware | |
| cp -r lib/firmware/* "$out/lib/firmware/" | |
| + # iwlwifi is packaged separately, but we need Bluetooth fw | |
| + rm $out/lib/firmware/iwlwifi* | |
| cp -r usr/share/doc $out/share/ | |
| find $out/share -name changelog.gz | xargs rm | |
| ''; | |
| commit 1716c12b5410c26f7371a00be8c3f19ab6b6c907 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Mon Dec 1 16:24:45 2014 -0800 | |
| iwlwifi: Split into separate package with more up to date firmware | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 04823ffeda0..2868be73d39 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -17,7 +17,8 @@ let | |
| { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } | |
| { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } | |
| { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } | |
| - { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } | |
| + # Disabled as it is packaged separately | |
| + #{ name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } | |
| { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } | |
| { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } | |
| { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } | |
| commit 5dfcfefec271fe2755fb0523c2fc45535c706c61 | |
| Author: William A. Kennington III <william@wkennington.com> | |
| Date: Sun Aug 17 10:39:23 2014 -0700 | |
| firmware-linux-nonfree: 0.41 -> 0.43 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 5afa2cbe4eb..04823ffeda0 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -6,27 +6,27 @@ | |
| { stdenv, fetchurl, dpkg }: | |
| let | |
| - version = "0.41"; | |
| + version = "0.43"; | |
| packages = [ | |
| - { name = "adi"; sha256 = "19dm96djp34g6l84g9shwbmqbmfd15c24frcy1zh5nz8x12phgm4"; } | |
| - { name = "atheros"; sha256 = "0vrdyxiq7nx89h6ykdrs8s3l9frn3hmcfb9vsz68i12975y8ib5n"; } | |
| - { name = "bnx2"; sha256 = "12l3l54q69n1ky8lp7bmzscfqysabjrgmswwj57ryc6l82s7081y"; } | |
| - { name = "bnx2x"; sha256 = "10m9p479dq2ylpj5mw6d5vyfh9hybmh5xgs5sxma065v7r3c3v31"; } | |
| - { name = "brcm80211"; sha256 = "0l2lg5pshb1kb829hfq9w791scwa8biikrfzsx9wvlvkyxfdh187"; } | |
| - { name = "intelwimax"; sha256 = "13jqm8ik0mm8vnsskbbp63idpjqazzp2x4gaq7786jg5yj3zh1cf"; } | |
| - { name = "ipw2x00"; sha256 = "1hvxrzqbc75phxdbmqfh7ky36m0qna2pncwxpfdircy9i6fx7ipy"; } | |
| - { name = "ivtv"; sha256 = "0ckw1ynzfqnkwlmwpzfbdfx4s6bsl4nwp097g8khaavqxk94n88v"; } | |
| - { name = "iwlwifi"; sha256 = "1djazi2qsi5z6q0izirprxgfpg8vh55skab2nijyfl66drlcha72"; } | |
| - { name = "libertas"; sha256 = "1yj9dd9pwd98gknx5mvblfcbr6k347xzi8l6bk0pr4570j8ss8y3"; } | |
| - { name = "linux"; sha256 = "0vc4cbrq73y5hibx5k3gbfqaqxvaa3g8rv9kzwks2zl3hdxm6xaq"; } | |
| - { name = "linux-nonfree"; sha256 = "05vv8yq7kix5cw9s4agz4vgya6i3ff88jp3rxln1ssznhvzrjzx9"; } | |
| - { name = "myricom"; sha256 = "1idfvdfw7z4jbbjyq40hd2bpllvw7jz0ah7k3iwljxp8l2lf2nmf"; } | |
| - { name = "netxen"; sha256 = "0fdgllv8i7j9qbk5hi14zvw6fcn4nd1isr1486d8fv7nf2bf1mxx"; } | |
| - { name = "qlogic"; sha256 = "12w1qnqhs24am2psdfmv0ligczzxh9crllmp7r4y3vqghyvwax7i"; } | |
| - { name = "ralink"; sha256 = "1ryplg9shi7nam79zd86z7a0qzp0f9m7q89nq989z57qiysbrra4"; } | |
| - { name = "realtek"; sha256 = "1l867724qrw7nwksdv4k0hkz7nrjjs9vq2s3937wyaa0r2r66mg6"; } | |
| - { name = "ti-connectivity"; sha256 = "00cl9gyxa7795a57zwcvl26kxfl4qzppi4z8ksg5friv3db8sm1p"; } | |
| + { name = "adi"; sha256 = "13cwnbispivpd73k928l1i818ylhpahp6xh7d6pw59sswrsx6inw"; } | |
| + { name = "atheros"; sha256 = "0sw9d52k3ynx1cxg7cq49pmm8y6vlqyhb9843hbyf6nbmjqj72bx"; } | |
| + { name = "bnx2"; sha256 = "1r8scys27qj5shdbgl8ag9vi4hiidx4bp8yw4n4dcp288d9x7bbh"; } | |
| + { name = "bnx2x"; sha256 = "03jx4vnn8irlwswydf4h3ya1kf064jkaj67jry2hr6qwpd4l8pgq"; } | |
| + { name = "brcm80211"; sha256 = "01mkmjkg16kdd26pwlg4a1s1717fh0j602mwqhwh46k8zakg2lkh"; } | |
| + { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } | |
| + { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } | |
| + { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } | |
| + { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } | |
| + { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } | |
| + { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } | |
| + { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } | |
| + { name = "myricom"; sha256 = "17cdl885jlnja5m60l35xr2f84hv8z4cvg3d25vpp171s1vf1ks1"; } | |
| + { name = "netxen"; sha256 = "122nava9ld1v8gcnqbdpx0kffv0rxm9glp4xg09ssvldy4myfgl7"; } | |
| + { name = "qlogic"; sha256 = "02pgmprz1qwij7lw1lgmb8clgxj8v3mx0fyy1l4z7bffnpvip863"; } | |
| + { name = "ralink"; sha256 = "0yw9gf9gm3jxmsndr8kcsf6829smm88kshfb4c8jn0n6f4yy9l7x"; } | |
| + { name = "realtek"; sha256 = "0gay9x47pimdqj665sr1416l3bdyca9grsqpj0s9n6k1lmywrqx1"; } | |
| + { name = "ti-connectivity"; sha256 = "1m6yk0827991hs46l8pp8iiwh1ms0rwlmwn64k2wr725k5yzg29b"; } | |
| ]; | |
| fetchPackage = | |
| commit 890d0cc3a507e10f9f402805d1b5c43997ce603a | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Fri Apr 18 15:34:10 2014 +0200 | |
| firmware-linux-nonfree: Update to 0.41 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index f5efc565753..5afa2cbe4eb 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -6,26 +6,27 @@ | |
| { stdenv, fetchurl, dpkg }: | |
| let | |
| - version = "0.40"; | |
| + version = "0.41"; | |
| packages = [ | |
| - { name = "adi"; sha256 = "0wwks9ff4n772435s57z1fjrffi4xl9nxnfn3v7xfcwdjb395d88"; } | |
| - { name = "atheros"; sha256 = "1gj7hfnyclzgyq06scynaclnfajhs6lw5i51j1w1hikv4yh20djz"; } | |
| - { name = "bnx2"; sha256 = "15qjj0sfjin5cbkpby29r5czn11xyiyyc4fmhwlqvgfgrnbp0aqk"; } | |
| - { name = "bnx2x"; sha256 = "08nvbln94ff47b2q0avxj1aa2wx4qih8sq8knbq54lp46kjf3k0h"; } | |
| - { name = "brcm80211"; sha256 = "1ndsw3s6xkr1n39nf9ig1xhnaglx5qvvvm8rh6ah41v644lzha79"; } | |
| - { name = "intelwimax"; sha256 = "1qwxmykh90v92asn4ivq0fak761hs7hd2zmz1dpkjidwsycrfyqn"; } | |
| - { name = "ipw2x00"; sha256 = "0a2nb17b5n3k1b6y4dbi5i8k1fm19ba2abq2jh2hjjmyyl3y388m"; } | |
| - { name = "ivtv"; sha256 = "1239gsjq16f4kd1yn77iq3ar8ndx3pzd16kpqafr1h2y0zwh452r"; } | |
| - { name = "iwlwifi"; sha256 = "03kmh5szd02pkbm1nlyz99fr2njhg88wiv73f1fz485m9rvgga43"; } | |
| - { name = "libertas"; sha256 = "0qjziwmwqbp83hxrjw7x3ralxg4ib9y23bcbn1g8yb5b6m84ca6b"; } | |
| - { name = "linux"; sha256 = "0ypidsrrfx4kvbfisdpgx2fzbil7g2jixgqhnv960iy5l348amrl"; } | |
| - { name = "linux-nonfree"; sha256 = "0p9ql3cdxljflh48r6z40kpyisbzp3s3g1qjb9f64n6cppllwjfr"; } | |
| - { name = "myricom"; sha256 = "12spfaq7z2bb93cy15zldlic1wx2v6h9sn7ny09nkzy4m26zds4q"; } | |
| - { name = "netxen"; sha256 = "03gmda16bdqw8a4x8x11ph41ksjh48hxydv0f0z3gi3czgbh7sn3"; } | |
| - { name = "qlogic"; sha256 = "1ah8rrwzi44p1l4q8qkql18djmn5kihsiinpy204xklm1csf3vs1"; } | |
| - { name = "ralink"; sha256 = "005549jk0wnyfnb247awv2wncsx5is05m1hdwcd33iq0dlbmm39b"; } | |
| - { name = "realtek"; sha256 = "1ai1klzrql8qxmb7945xiqlkfkyz8admrpb10b3r4ixvclkrvfi2"; } | |
| + { name = "adi"; sha256 = "19dm96djp34g6l84g9shwbmqbmfd15c24frcy1zh5nz8x12phgm4"; } | |
| + { name = "atheros"; sha256 = "0vrdyxiq7nx89h6ykdrs8s3l9frn3hmcfb9vsz68i12975y8ib5n"; } | |
| + { name = "bnx2"; sha256 = "12l3l54q69n1ky8lp7bmzscfqysabjrgmswwj57ryc6l82s7081y"; } | |
| + { name = "bnx2x"; sha256 = "10m9p479dq2ylpj5mw6d5vyfh9hybmh5xgs5sxma065v7r3c3v31"; } | |
| + { name = "brcm80211"; sha256 = "0l2lg5pshb1kb829hfq9w791scwa8biikrfzsx9wvlvkyxfdh187"; } | |
| + { name = "intelwimax"; sha256 = "13jqm8ik0mm8vnsskbbp63idpjqazzp2x4gaq7786jg5yj3zh1cf"; } | |
| + { name = "ipw2x00"; sha256 = "1hvxrzqbc75phxdbmqfh7ky36m0qna2pncwxpfdircy9i6fx7ipy"; } | |
| + { name = "ivtv"; sha256 = "0ckw1ynzfqnkwlmwpzfbdfx4s6bsl4nwp097g8khaavqxk94n88v"; } | |
| + { name = "iwlwifi"; sha256 = "1djazi2qsi5z6q0izirprxgfpg8vh55skab2nijyfl66drlcha72"; } | |
| + { name = "libertas"; sha256 = "1yj9dd9pwd98gknx5mvblfcbr6k347xzi8l6bk0pr4570j8ss8y3"; } | |
| + { name = "linux"; sha256 = "0vc4cbrq73y5hibx5k3gbfqaqxvaa3g8rv9kzwks2zl3hdxm6xaq"; } | |
| + { name = "linux-nonfree"; sha256 = "05vv8yq7kix5cw9s4agz4vgya6i3ff88jp3rxln1ssznhvzrjzx9"; } | |
| + { name = "myricom"; sha256 = "1idfvdfw7z4jbbjyq40hd2bpllvw7jz0ah7k3iwljxp8l2lf2nmf"; } | |
| + { name = "netxen"; sha256 = "0fdgllv8i7j9qbk5hi14zvw6fcn4nd1isr1486d8fv7nf2bf1mxx"; } | |
| + { name = "qlogic"; sha256 = "12w1qnqhs24am2psdfmv0ligczzxh9crllmp7r4y3vqghyvwax7i"; } | |
| + { name = "ralink"; sha256 = "1ryplg9shi7nam79zd86z7a0qzp0f9m7q89nq989z57qiysbrra4"; } | |
| + { name = "realtek"; sha256 = "1l867724qrw7nwksdv4k0hkz7nrjjs9vq2s3937wyaa0r2r66mg6"; } | |
| + { name = "ti-connectivity"; sha256 = "00cl9gyxa7795a57zwcvl26kxfl4qzppi4z8ksg5friv3db8sm1p"; } | |
| ]; | |
| fetchPackage = | |
| commit 26028c2107cd4ad1f7059735bec043d5fcaf3e4d | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Wed Sep 4 14:22:24 2013 +0200 | |
| Install firmware in $out/lib/firmware instead of $out | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 6bc4cf3f865..f5efc565753 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -54,8 +54,8 @@ in stdenv.mkDerivation { | |
| buildInputs = [ dpkg ]; | |
| installPhase = '' | |
| - mkdir -p $out/share | |
| - cp -r lib/firmware/* "$out/" | |
| + mkdir -p $out/share $out/lib/firmware | |
| + cp -r lib/firmware/* "$out/lib/firmware/" | |
| cp -r usr/share/doc $out/share/ | |
| find $out/share -name changelog.gz | xargs rm | |
| ''; | |
| commit b8bc3aa26d81c9031d6c883a47eddea15b6037d7 | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Wed Sep 4 13:59:25 2013 +0200 | |
| Remove meaningless package priority | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 9ddddfde259..6bc4cf3f865 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -65,6 +65,5 @@ in stdenv.mkDerivation { | |
| homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| license = stdenv.lib.licenses.unfreeRedistributableFirmware; | |
| platforms = stdenv.lib.platforms.linux; | |
| - priority = 10; # low priority so that other packages can override this big package | |
| }; | |
| } | |
| commit f69eb63a1bf4444a5deacdc88282f2a29b87805d | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Wed Aug 14 03:59:38 2013 +0200 | |
| firmware-linux-nonfree: Install copyright notices | |
| Most of the firmwares require that redistribution in binary form | |
| reproduces the copyright notice. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 952351a9b88..9ddddfde259 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -54,8 +54,10 @@ in stdenv.mkDerivation { | |
| buildInputs = [ dpkg ]; | |
| installPhase = '' | |
| - mkdir -p "$out/" | |
| + mkdir -p $out/share | |
| cp -r lib/firmware/* "$out/" | |
| + cp -r usr/share/doc $out/share/ | |
| + find $out/share -name changelog.gz | xargs rm | |
| ''; | |
| meta = { | |
| commit d0617613dd8fd41181376692543be8125088d700 | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Wed Aug 14 03:56:07 2013 +0200 | |
| firmware-linux-nonfree: Update to 0.40 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 24906f2b0db..952351a9b88 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -3,28 +3,29 @@ | |
| # You can either install the complete bundle, or write a separate package for individual | |
| # devices that copies the firmware from this package. | |
| -{ stdenv, fetchurl, buildEnv, dpkg }: | |
| +{ stdenv, fetchurl, dpkg }: | |
| let | |
| - version = "0.38"; | |
| + version = "0.40"; | |
| packages = [ | |
| - { name = "ipw2x00"; sha256 = "1bdial90l1928sfw3j1fz5cbsav8lz9riv38d02bawq9rzvb5dx0"; } | |
| - { name = "bnx2x"; sha256 = "1a8jwwa6yldj2pgnsghhdkb8c0s64wzg0vx8y3cj11lhbh2ag2i7"; } | |
| - { name = "linux-nonfree"; sha256 = "0dr91sswvkh0lk80d6byxjavkqcsickqf8xqhdd82j9mm7bjg7ld"; } | |
| - { name = "intelwimax"; sha256 = "1156c7a301lk2a4d699dmvwzh4k3rfbxl4fx4raafy8a15lbw8mn"; } | |
| - { name = "iwlwifi"; sha256 = "1q6gl2x4lj83hn8acamlj7s4j8vjd02798a6i52f4r7x0042f58a"; } | |
| - { name = "bnx2"; sha256 = "0rpsrmywh97azqmsx4qgxyqcvdn5414m9cg92pd7h9xfmm38nscd"; } | |
| - { name = "qlogic"; sha256 = "02438jzzybicg0bvl2jc3qnn0r4f1pfpyxbf70cmas9sfxb7s3az"; } | |
| - { name = "libertas"; sha256 = "0b8n1igx6hpxlav73xs8r6qs2v95r9hx4lqqzy0h5iy7md9xs9y4"; } | |
| - { name = "ivtv"; sha256 = "1vb1jbxdggy2vj1xlncfzyynpra1y62bb3n30ybafjnx88p6f2hi"; } | |
| - { name = "linux"; sha256 = "0ijd49rf7cg0lniqm9sqz2g4i9jmc9vyz6wv9jlwrvnbl8hhy5vy"; } | |
| - { name = "netxen"; sha256 = "19d5d3ibhb22p4mh22lnl441v8xyb1pyfi5h36vsjpccivzkgd2f"; } | |
| - { name = "myricom"; sha256 = "0vq2rvc71j96q684r1bh0528xnrxa1xzh2sdhqfrgip9ihdsp3ml"; } | |
| - { name = "atheros"; sha256 = "04zy5j48b83garmnfxiqgmm3yv1pfpbldxp69zm24pfxcwyvx3hm"; } | |
| - { name = "brcm80211"; sha256 = "0kgw6q18i46npmjxv4ymww8dr7nn140xrrqjrbnfhzgha3y2yylg"; } | |
| - { name = "ralink"; sha256 = "0kbzbc4vpn6mvvkm4q7mfqg0bsj6akfpypxk98s7kbidmyj577q2"; } | |
| - { name = "realtek"; sha256 = "1ac9vlrzprp0j2mdmp1zi47wg2i76vmi288sm3vwlvp4s6ymm077"; } | |
| + { name = "adi"; sha256 = "0wwks9ff4n772435s57z1fjrffi4xl9nxnfn3v7xfcwdjb395d88"; } | |
| + { name = "atheros"; sha256 = "1gj7hfnyclzgyq06scynaclnfajhs6lw5i51j1w1hikv4yh20djz"; } | |
| + { name = "bnx2"; sha256 = "15qjj0sfjin5cbkpby29r5czn11xyiyyc4fmhwlqvgfgrnbp0aqk"; } | |
| + { name = "bnx2x"; sha256 = "08nvbln94ff47b2q0avxj1aa2wx4qih8sq8knbq54lp46kjf3k0h"; } | |
| + { name = "brcm80211"; sha256 = "1ndsw3s6xkr1n39nf9ig1xhnaglx5qvvvm8rh6ah41v644lzha79"; } | |
| + { name = "intelwimax"; sha256 = "1qwxmykh90v92asn4ivq0fak761hs7hd2zmz1dpkjidwsycrfyqn"; } | |
| + { name = "ipw2x00"; sha256 = "0a2nb17b5n3k1b6y4dbi5i8k1fm19ba2abq2jh2hjjmyyl3y388m"; } | |
| + { name = "ivtv"; sha256 = "1239gsjq16f4kd1yn77iq3ar8ndx3pzd16kpqafr1h2y0zwh452r"; } | |
| + { name = "iwlwifi"; sha256 = "03kmh5szd02pkbm1nlyz99fr2njhg88wiv73f1fz485m9rvgga43"; } | |
| + { name = "libertas"; sha256 = "0qjziwmwqbp83hxrjw7x3ralxg4ib9y23bcbn1g8yb5b6m84ca6b"; } | |
| + { name = "linux"; sha256 = "0ypidsrrfx4kvbfisdpgx2fzbil7g2jixgqhnv960iy5l348amrl"; } | |
| + { name = "linux-nonfree"; sha256 = "0p9ql3cdxljflh48r6z40kpyisbzp3s3g1qjb9f64n6cppllwjfr"; } | |
| + { name = "myricom"; sha256 = "12spfaq7z2bb93cy15zldlic1wx2v6h9sn7ny09nkzy4m26zds4q"; } | |
| + { name = "netxen"; sha256 = "03gmda16bdqw8a4x8x11ph41ksjh48hxydv0f0z3gi3czgbh7sn3"; } | |
| + { name = "qlogic"; sha256 = "1ah8rrwzi44p1l4q8qkql18djmn5kihsiinpy204xklm1csf3vs1"; } | |
| + { name = "ralink"; sha256 = "005549jk0wnyfnb247awv2wncsx5is05m1hdwcd33iq0dlbmm39b"; } | |
| + { name = "realtek"; sha256 = "1ai1klzrql8qxmb7945xiqlkfkyz8admrpb10b3r4ixvclkrvfi2"; } | |
| ]; | |
| fetchPackage = | |
| @@ -40,7 +41,7 @@ in stdenv.mkDerivation { | |
| inherit srcs; | |
| unpackPhase = '' | |
| - ensureDir "./firmware" | |
| + mkdir -p ./firmware | |
| ''; | |
| buildPhase = '' | |
| @@ -59,7 +60,7 @@ in stdenv.mkDerivation { | |
| meta = { | |
| description = "Binary firmware collection packaged by Debian"; | |
| - homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; | |
| + homepage = http://packages.debian.org/sid/firmware-linux-nonfree; | |
| license = stdenv.lib.licenses.unfreeRedistributableFirmware; | |
| platforms = stdenv.lib.platforms.linux; | |
| priority = 10; # low priority so that other packages can override this big package | |
| commit b6f7f05b351e09e43a7ced891d3d975981f85474 | |
| Author: Domen Kozar <domen@dev.si> | |
| Date: Wed Jun 5 22:44:08 2013 +0200 | |
| adding unfree-redistributable-firmware | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 8567dadec50..24906f2b0db 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -60,7 +60,7 @@ in stdenv.mkDerivation { | |
| meta = { | |
| description = "Binary firmware collection packaged by Debian"; | |
| homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; | |
| - license = stdenv.lib.licenses.unfreeRedistributable; | |
| + license = stdenv.lib.licenses.unfreeRedistributableFirmware; | |
| platforms = stdenv.lib.platforms.linux; | |
| priority = 10; # low priority so that other packages can override this big package | |
| }; | |
| commit 8ac0a0ac46616f270861df50936cdecf7054875f | |
| Author: Domen Kozar <domen@dev.si> | |
| Date: Thu May 23 21:00:07 2013 +0200 | |
| firmware-linux-nonfree: set platform as linux | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 6d921d55338..8567dadec50 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -61,6 +61,7 @@ in stdenv.mkDerivation { | |
| description = "Binary firmware collection packaged by Debian"; | |
| homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; | |
| license = stdenv.lib.licenses.unfreeRedistributable; | |
| + platforms = stdenv.lib.platforms.linux; | |
| priority = 10; # low priority so that other packages can override this big package | |
| }; | |
| } | |
| commit 7bbe5823e89bc903dce685aab489335585d28d0b | |
| Author: Domen Kozar <domen@dev.si> | |
| Date: Wed May 15 15:22:50 2013 +0200 | |
| let hydra mirror unfree firmware | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index a90b701f49e..6d921d55338 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -60,7 +60,7 @@ in stdenv.mkDerivation { | |
| meta = { | |
| description = "Binary firmware collection packaged by Debian"; | |
| homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; | |
| - license = "unfree-redistributable-firmware"; | |
| + license = stdenv.lib.licenses.unfreeRedistributable; | |
| priority = 10; # low priority so that other packages can override this big package | |
| }; | |
| } | |
| commit f6e15f0d694714b68c18071cd38174bac78408a9 | |
| Author: Joachim Schiele <js@lastlog.de> | |
| Date: Sat May 11 16:56:28 2013 +0000 | |
| updated firmware-linux from 0.36-to-0.38 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index f6173fcf5f5..a90b701f49e 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -6,26 +6,25 @@ | |
| { stdenv, fetchurl, buildEnv, dpkg }: | |
| let | |
| - version = "0.36"; | |
| - | |
| + version = "0.38"; | |
| packages = [ | |
| - { name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; } | |
| - { name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; } | |
| - { name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; } | |
| - { name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; } | |
| - { name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; } | |
| - { name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; } | |
| - { name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; } | |
| - { name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; } | |
| - { name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; } | |
| - { name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; } | |
| - { name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; } | |
| - { name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; } | |
| - { name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; } | |
| - { name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; } | |
| - { name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; } | |
| - { name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; } | |
| + { name = "ipw2x00"; sha256 = "1bdial90l1928sfw3j1fz5cbsav8lz9riv38d02bawq9rzvb5dx0"; } | |
| + { name = "bnx2x"; sha256 = "1a8jwwa6yldj2pgnsghhdkb8c0s64wzg0vx8y3cj11lhbh2ag2i7"; } | |
| + { name = "linux-nonfree"; sha256 = "0dr91sswvkh0lk80d6byxjavkqcsickqf8xqhdd82j9mm7bjg7ld"; } | |
| + { name = "intelwimax"; sha256 = "1156c7a301lk2a4d699dmvwzh4k3rfbxl4fx4raafy8a15lbw8mn"; } | |
| + { name = "iwlwifi"; sha256 = "1q6gl2x4lj83hn8acamlj7s4j8vjd02798a6i52f4r7x0042f58a"; } | |
| + { name = "bnx2"; sha256 = "0rpsrmywh97azqmsx4qgxyqcvdn5414m9cg92pd7h9xfmm38nscd"; } | |
| + { name = "qlogic"; sha256 = "02438jzzybicg0bvl2jc3qnn0r4f1pfpyxbf70cmas9sfxb7s3az"; } | |
| + { name = "libertas"; sha256 = "0b8n1igx6hpxlav73xs8r6qs2v95r9hx4lqqzy0h5iy7md9xs9y4"; } | |
| + { name = "ivtv"; sha256 = "1vb1jbxdggy2vj1xlncfzyynpra1y62bb3n30ybafjnx88p6f2hi"; } | |
| + { name = "linux"; sha256 = "0ijd49rf7cg0lniqm9sqz2g4i9jmc9vyz6wv9jlwrvnbl8hhy5vy"; } | |
| + { name = "netxen"; sha256 = "19d5d3ibhb22p4mh22lnl441v8xyb1pyfi5h36vsjpccivzkgd2f"; } | |
| + { name = "myricom"; sha256 = "0vq2rvc71j96q684r1bh0528xnrxa1xzh2sdhqfrgip9ihdsp3ml"; } | |
| + { name = "atheros"; sha256 = "04zy5j48b83garmnfxiqgmm3yv1pfpbldxp69zm24pfxcwyvx3hm"; } | |
| + { name = "brcm80211"; sha256 = "0kgw6q18i46npmjxv4ymww8dr7nn140xrrqjrbnfhzgha3y2yylg"; } | |
| + { name = "ralink"; sha256 = "0kbzbc4vpn6mvvkm4q7mfqg0bsj6akfpypxk98s7kbidmyj577q2"; } | |
| + { name = "realtek"; sha256 = "1ac9vlrzprp0j2mdmp1zi47wg2i76vmi288sm3vwlvp4s6ymm077"; } | |
| ]; | |
| fetchPackage = | |
| commit abf60bdb08e509dda5e95ce13f606e7586dacdfc | |
| Author: James Cook <jcook@cs.berkeley.edu> | |
| Date: Tue Oct 9 23:18:50 2012 -0700 | |
| Upgrade firmware-linux-nonfree to 0.36, because the last version disappeared from the Debian mirrors. | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index e2ba47abb9a..f6173fcf5f5 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -6,25 +6,26 @@ | |
| { stdenv, fetchurl, buildEnv, dpkg }: | |
| let | |
| - version = "0.35"; | |
| + version = "0.36"; | |
| + | |
| packages = [ | |
| - { name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; } | |
| - { name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; } | |
| - { name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; } | |
| - { name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; } | |
| - { name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; } | |
| - { name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; } | |
| - { name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; } | |
| - { name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; } | |
| - { name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; } | |
| - { name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; } | |
| - { name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; } | |
| - { name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; } | |
| - { name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; } | |
| - { name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; } | |
| - { name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; } | |
| - { name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; } | |
| + { name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; } | |
| + { name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; } | |
| + { name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; } | |
| + { name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; } | |
| + { name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; } | |
| + { name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; } | |
| + { name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; } | |
| + { name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; } | |
| + { name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; } | |
| + { name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; } | |
| + { name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; } | |
| + { name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; } | |
| + { name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; } | |
| + { name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; } | |
| + { name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; } | |
| + { name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; } | |
| ]; | |
| fetchPackage = | |
| commit 5144a19987ee5148e0a21b0d44be4a00dde24f96 | |
| Merge: 232da3a29db e9974606a50 | |
| Author: Yury G. Kudryashov <urkud.urkud@gmail.com> | |
| Date: Fri Feb 10 10:24:30 2012 +0000 | |
| svn merge ^/nixpkgs/trunk | |
| There were a few merge conflicts due to ensureDir->mkdir -p migration | |
| svn path=/nixpkgs/branches/stdenv-updates/; revision=32174 | |
| commit 3f5643417a699f7acb1922fd08c0c27ad8bbb31e | |
| Author: Arie Middelkoop <amiddelk@gmail.com> | |
| Date: Tue Feb 7 09:14:34 2012 +0000 | |
| linux-firmware-nonfree 0.33 -> 0.35 | |
| svn path=/nixpkgs/trunk/; revision=32097 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 6ad2227ee69..c35f6c2d9bd 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,32 +1,66 @@ | |
| -# TODO: some files are not at the right place. | |
| -# For now, we take the strategy of adding symlinks to fix this, | |
| -# however it is probably better to extract the files from | |
| -# the appropriate debian binary packages. | |
| +# The firmware bundle as packaged by Debian. This should be "all" firmware that is not shipped | |
| +# as part of the kernel itself. | |
| +# You can either install the complete bundle, or write a separate package for individual | |
| +# devices that copies the firmware from this package. | |
| -{stdenv, fetchurl}: | |
| +{ stdenv, fetchurl, buildEnv, dpkg }: | |
| -stdenv.mkDerivation { | |
| - name = "firmware-linux-nonfree-0.34"; | |
| +let | |
| + version = "0.35"; | |
| - src = fetchurl { | |
| - url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-nonfree_0.34.tar.gz"; | |
| - sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a"; | |
| + packages = [ | |
| + { name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; } | |
| + { name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; } | |
| + { name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; } | |
| + { name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; } | |
| + { name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; } | |
| + { name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; } | |
| + { name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; } | |
| + { name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; } | |
| + { name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; } | |
| + { name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; } | |
| + { name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; } | |
| + { name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; } | |
| + { name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; } | |
| + { name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; } | |
| + { name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; } | |
| + { name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; } | |
| + ]; | |
| + | |
| + fetchPackage = | |
| + { name, sha256 }: fetchurl { | |
| + url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-${name}_${version}_all.deb"; | |
| + inherit sha256; | |
| }; | |
| - | |
| - phases = [ "unpackPhase" "patchPhase" "installPhase" "postInstall" ]; | |
| - patchPhase = "rm -rf debian defines TODO"; | |
| + srcs = map fetchPackage packages; | |
| + | |
| +in stdenv.mkDerivation { | |
| + name = "firmware-linux-nonfree-${version}"; | |
| + inherit srcs; | |
| + | |
| + unpackPhase = '' | |
| + ensureDir "./firmware" | |
| + ''; | |
| - installPhase = "ensureDir $out && cp -ra * $out/"; | |
| + buildPhase = '' | |
| + for src in $srcs; do | |
| + dpkg-deb -W $src | |
| + dpkg-deb -x $src . | |
| + done | |
| + ''; | |
| - # repeat the same trick for radeon, 3com, etc. | |
| - postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; | |
| + buildInputs = [ dpkg ]; | |
| + | |
| + installPhase = '' | |
| + ensureDir "$out/" | |
| + cp -r lib/firmware/* "$out/" | |
| + ''; | |
| meta = { | |
| - description = "Non-free kernel firmware (packaged by Debian)"; | |
| + description = "Binary firmware collection packaged by Debian"; | |
| homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; | |
| license = "unfree-redistributable-firmware"; | |
| - priority = "10"; | |
| + priority = 10; # low priority so that other packages can override this big package | |
| }; | |
| } | |
| - | |
| commit c556a6ea46e71e1907d78b71fab36df30297b3ad | |
| Author: Eelco Dolstra <eelco.dolstra@logicblox.com> | |
| Date: Wed Jan 18 20:16:00 2012 +0000 | |
| * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless | |
| function, so obsolete it. | |
| svn path=/nixpkgs/branches/stdenv-updates/; revision=31644 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index 6ad2227ee69..f468b183be9 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -17,7 +17,7 @@ stdenv.mkDerivation { | |
| patchPhase = "rm -rf debian defines TODO"; | |
| - installPhase = "ensureDir $out && cp -ra * $out/"; | |
| + installPhase = "mkdir -p $out && cp -ra * $out/"; | |
| # repeat the same trick for radeon, 3com, etc. | |
| postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; | |
| commit 32327df9187e580711ec5f78871fd57c44637a8f | |
| Author: Arie Middelkoop <amiddelk@gmail.com> | |
| Date: Sat Jan 14 09:31:12 2012 +0000 | |
| Removed the now obsolete firmware-linux-free package. | |
| svn path=/nixpkgs/trunk/; revision=31528 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| index d501891d2a1..6ad2227ee69 100644 | |
| --- pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -1,3 +1,8 @@ | |
| +# TODO: some files are not at the right place. | |
| +# For now, we take the strategy of adding symlinks to fix this, | |
| +# however it is probably better to extract the files from | |
| +# the appropriate debian binary packages. | |
| + | |
| {stdenv, fetchurl}: | |
| stdenv.mkDerivation { | |
| @@ -8,10 +13,13 @@ stdenv.mkDerivation { | |
| sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a"; | |
| }; | |
| - phases = [ "unpackPhase" "installPhase" "postInstall" ]; | |
| + phases = [ "unpackPhase" "patchPhase" "installPhase" "postInstall" ]; | |
| + | |
| + patchPhase = "rm -rf debian defines TODO"; | |
| installPhase = "ensureDir $out && cp -ra * $out/"; | |
| + # repeat the same trick for radeon, 3com, etc. | |
| postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; | |
| meta = { | |
| commit 0fa0da35ef96cc9a3c8895ab9858e579358dd604 | |
| Author: Arie Middelkoop <amiddelk@gmail.com> | |
| Date: Thu Jan 12 17:16:11 2012 +0000 | |
| Added firmware-linux-nonfree and directly also the free variant. | |
| Todo for later: take the files from the various .deb files instead of the source distribution. | |
| This version already improves upon my previous implementation, hence I commit it. | |
| svn path=/nixpkgs/trunk/; revision=31501 | |
| diff --git pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| new file mode 100644 | |
| index 00000000000..d501891d2a1 | |
| --- /dev/null | |
| +++ pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | |
| @@ -0,0 +1,24 @@ | |
| +{stdenv, fetchurl}: | |
| + | |
| +stdenv.mkDerivation { | |
| + name = "firmware-linux-nonfree-0.34"; | |
| + | |
| + src = fetchurl { | |
| + url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-nonfree_0.34.tar.gz"; | |
| + sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a"; | |
| + }; | |
| + | |
| + phases = [ "unpackPhase" "installPhase" "postInstall" ]; | |
| + | |
| + installPhase = "ensureDir $out && cp -ra * $out/"; | |
| + | |
| + postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; | |
| + | |
| + meta = { | |
| + description = "Non-free kernel firmware (packaged by Debian)"; | |
| + homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; | |
| + license = "unfree-redistributable-firmware"; | |
| + priority = "10"; | |
| + }; | |
| +} | |
| + |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment