Branch: refs/heads/release-16.03
Home: https://github.com/NixOS/nixpkgs
Commit: 5fb7b4b2aa8c1d59e2fa8caedf4fe31916a10fcb
https://github.com/NixOS/nixpkgs/commit/5fb7b4b2aa8c1d59e2fa8caedf4fe31916a10fcb
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-05 (Mon, 05 Sep 2016)
Changed paths:
M pkgs/os-specific/linux/broadcom-sta/default.nix
A pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch
R pkgs/os-specific/linux/broadcom-sta/linux-recent.patch
Log Message:
-----------
broadcom_sta: 6.30.223.248 -> 6.30.223.271
The patch for kernel version 3.18 is already applied upstream, so we
don't need it any longer.
Without i686-build-failure.patch, the build for i686-linux fails because
it references rdtscl(), which is no longer available in Linux 4.3.0.
Patch for missing rdtscl() is from Arch Linux:
https://aur.archlinux.org/cgit/aur.git/tree/002-rdtscl.patch?h=broadcom-wl-ck
I've tested building against 32 and 64 bit Linux versions 3.18.36,
4.4.16 and 4.7.0.
The hashes were verified using the ones from the AUR (using the 16 bit
hashes of course):
$ nix-hash --type sha256 --to-base16
1kaqa2dw3nb8k23ffvx46g8jj3wdhz8xa6jp1v3wb35cjfr712sg
4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd
$ nix-hash --type sha256 --to-base16
1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz
5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be
AUR hashes can be found at:
https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=broadcom-wl&id=9d6f10b1b7745fbf5d140ac749e2253caf70daa8#n26
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @phreedom, @vcunat
(cherry picked from commit bd7ce1581daa2a43cad3a73556ed94fc2031b0eb)
Commit: 531a73d4d0696874f4b11cae149c7eb559f223e6
https://github.com/NixOS/nixpkgs/commit/531a73d4d0696874f4b11cae149c7eb559f223e6
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-05 (Mon, 05 Sep 2016)
Changed paths:
M pkgs/os-specific/linux/broadcom-sta/default.nix
A pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch
Log Message:
-----------
broadcom_sta: Add patch for supporting Linux 4.7
Patch is from Arch Linux at:
https://aur.archlinux.org/cgit/aur.git/tree/?h=broadcom-wl
I've tested building against 3.18.36, 4.4.16 and 4.7.0.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @phreedom, @vcunat
(cherry picked from commit 4d3545f2a579f9c68ac131794e97e22a312d9422)
Commit: cbdd3719888d5d9c7322133b69aa8ce77d0f6d24
https://github.com/NixOS/nixpkgs/commit/cbdd3719888d5d9c7322133b69aa8ce77d0f6d24
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-05 (Mon, 05 Sep 2016)
Changed paths:
M pkgs/os-specific/linux/broadcom-sta/default.nix
Log Message:
-----------
broadcom_sta: Reindent file, no code changes
Let's make sure we indent using two spaces, because the unpackPhase was
indented using four spaces.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
(cherry picked from commit 8f08399671911842174056b46aa1cc66c82f2a71)
Commit: 8daf7e99af227ef871775cb596e2920d6e533ca4
https://github.com/NixOS/nixpkgs/commit/8daf7e99af227ef871775cb596e2920d6e533ca4
Author: aszlig <asz...@redmoonstudios.org>
Date: 2016-09-05 (Mon, 05 Sep 2016)
Changed paths:
M pkgs/os-specific/linux/broadcom-sta/default.nix
A pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch
Log Message:
-----------
broadcom_sta: Add patch to fix NULL pointer deref
The patch is from the following Gentoo bug:
https://bugs.gentoo.org/show_bug.cgi?id=523326#c24
Built successfully against Linux 3.18.36, 4.4.16 and 4.7.0.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @phreedom, @vcunat
(cherry picked from commit fef4b62657903021f9b60fc6a6cf6fe4bac167ed)
Commit: b6b0fcbccc0fed6f49f41c317c9adc8f68c6e70b
https://github.com/NixOS/nixpkgs/commit/b6b0fcbccc0fed6f49f41c317c9adc8f68c6e70b
Author: Graham Christensen <gra...@grahamc.com>
Date: 2016-09-05 (Mon, 05 Sep 2016)
Changed paths:
M pkgs/os-specific/linux/broadcom-sta/default.nix
A pkgs/os-specific/linux/broadcom-sta/i686-build-failure.patch
A pkgs/os-specific/linux/broadcom-sta/linux-4.7.patch
R pkgs/os-specific/linux/broadcom-sta/linux-recent.patch
A pkgs/os-specific/linux/broadcom-sta/null-pointer-fix.patch
Log Message:
-----------
Merge pull request #18329 from grahamc/broadcom-sta
Backport broadcom-sta fixes from master to release-16.03
Compare: https://github.com/NixOS/nixpkgs/compare/d8bade946096...b6b0fcbccc0f_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
