Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

broadcom_sta: fix build on 5.6 #84736

Merged
merged 1 commit into from Apr 29, 2020
Merged

broadcom_sta: fix build on 5.6 #84736

merged 1 commit into from Apr 29, 2020

Conversation

teto
Copy link
Member

@teto teto commented Apr 8, 2020 •
edited

Motivation for this change

necessary on my 8 year old macbook. I haven't rebooted yet hence the draft status.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from Phreedom April 8, 2020 16:45
@teto teto marked this pull request as ready for review April 11, 2020 13:43
@teto
Copy link
Member Author

teto commented Apr 11, 2020

after a reboot it works.

duckfullstop
duckfullstop approved these changes Apr 14, 2020
View reviewed changes
Copy link
Contributor

@duckfullstop duckfullstop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, getting this merged would be exceptionally useful (especially because it will probably break a lot of people's 20.04 upgrades)

@teto
Copy link
Member Author

teto commented Apr 15, 2020

@worldofpeace what do you think for the backport ? I know this would have broken my macbook's wifi and I don't think I am the only one.

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build linuxPackages_5_4.broadcom_sta linuxPackages_4_19.broadcom_sta linuxPackages_5_6.broadcom_sta

@worldofpeace
Copy link
Contributor

@worldofpeace what do you think for the backport ? I know this would have broken my macbook's wifi and I don't think I am the only one.

It is a bugfix, so it should be fine for stable.

worldofpeace
worldofpeace reviewed Apr 15, 2020
View reviewed changes
pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation {
./linux-4.12.patch
./linux-4.15.patch
./linux-5.1.patch
# source: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/commit/247307926e5540ad574a17c062c8da76990d056f
./linux-5.6.patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this patch any different than the one on salsa? (one could fetch https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/raw/247307926e5540ad574a17c062c8da76990d056f/debian/patches/16-linux56.patch)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to change the patch to remove the amd64 prefix from the various paths.

rasendubi
rasendubi approved these changes Apr 29, 2020
View reviewed changes
Copy link
Member

@rasendubi rasendubi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to merge?

@teto
Copy link
Member Author

teto commented Apr 29, 2020

worked fine for me so far.

@teto teto merged commit 8ce6508 into NixOS:master Apr 29, 2020
@teto teto deleted the broadcom branch April 29, 2020 09:57
elohmeier pushed a commit to elohmeier/nixpkgs that referenced this pull request May 1, 2020
@teto @elohmeier
broadcom_sta: fix build on 5.6
129e603 
(cherry picked from commit 8ce6508)
Reason: fixes issue for linuxPackages_latest users in 20.03, see NixOS#84736
@elohmeier elohmeier mentioned this pull request May 1, 2020
Merged
10 tasks
stigok pushed a commit to stigok/nixpkgs that referenced this pull request Jun 12, 2020
@teto @stigok
broadcom_sta: fix build on 5.6
efc46d2 
(cherry picked from commit 8ce6508)
Reason: fixes issue for linuxPackages_latest users in 20.03, see NixOS#84736
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace left review comments

@duckfullstop duckfullstop duckfullstop approved these changes

@rasendubi rasendubi rasendubi approved these changes

@Phreedom Phreedom Awaiting requested review from Phreedom

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@teto @worldofpeace @duckfullstop @rasendubi