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 linux-4.8 patch sha #24969

Merged
merged 1 commit into from Apr 17, 2017
Merged

broadcom-sta: fix linux-4.8 patch sha #24969

merged 1 commit into from Apr 17, 2017

Conversation

gilligan
Copy link
Contributor

Motivation for this change

Fix #24968

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@gilligan, thanks for your PR! By analyzing the history of the files in this pull request, we identified @aszlig, @grahamc and @tobias-hammerschmidt to be potential reviewers.

Mic92
Mic92 reviewed Apr 17, 2017
View reviewed changes
pkgs/os-specific/linux/broadcom-sta/default.nix Outdated
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
(fetchpatch {
name = "linux-4.8.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=broadcom-wl-dkms";
Copy link
Member

@Mic92 Mic92 Apr 17, 2017 •
edited

Choose a reason for hiding this comment

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

I would suggest to choose a stable url like: https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f (points to a commit rather then a branch).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, lets avoid having to do this over and over again ;-) Thanks for the stable link!

@Mic92 Mic92 merged commit 15d60bc into NixOS:master Apr 17, 2017
@dimatomp
Copy link

Now the sha256 has changed back to "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax"...

@Mic92
Copy link
Member

Mic92 commented Apr 19, 2017 •
edited

I cannot confirm this. It is still: 0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a
Also the url is stable now.

@dimatomp
Copy link

dimatomp commented Apr 19, 2017 •
edited

On nixos-17.03:

trying https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  1835  100  1835    0     0   9411      0 --:--:-- --:--:-- --:--:--  9458
output path ‘/nix/store/i8cnagilc4sh06vaw3bsj2lyyrpvs3ia-linux-4.8.patch’ has sha256 hash ‘1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax’ when ‘0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a’ was expected

Meanwhile, nix-prefetch-url gives correct hash from the file.
Looks like there is some lack of knowledge on my side, I apologize for the previous silly comment.

@Mic92
Copy link
Member

Mic92 commented Apr 19, 2017

The pull request was also back ported here 058b899

@seanparsons
Copy link
Contributor

I'm seeing this as well:

trying https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f
output path ‘/nix/store/i8cnagilc4sh06vaw3bsj2lyyrpvs3ia-linux-4.8.patch’ has sha256 hash ‘1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax’ when ‘0b963540gaj06q6ynfg47z8k5y3k2503yahbwawclfq4cxhl472a’ was expected
cannot build derivation ‘/nix/store/3azw7nv7s0rhfml2wlimgy7idc8filw1-broadcom-sta-6.30.223.271-4.9.23.drv’: 1 dependencies couldn't be built

@dimatomp
Copy link

dimatomp commented Apr 19, 2017 •
edited 

    (fetchpatch {
      name = "linux-4.8.patch";
      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms&id=8c6d80fc77eb20cbb4fd0eca71fa8a03b9447c3f";
      sha256 = "1g1gazxx67kxyw242cli6bf62il7ikzmf0w6v14k44j6b4bihcax";
    })

This worked for me on nixos-17.03; I still don't know how value of sha256 sum could depend on a branch. Maybe I will investigate it a bit later

@Mic92
Copy link
Member

Mic92 commented Apr 20, 2017 •
edited

I do not know, what is going on here: the checksum also broke on master again.
I added the patch source into nixpkgs now in master and in release-17.03:

@gilligan gilligan deleted the fix-broadcom-hash branch April 24, 2017 07:27
@gilligan
Copy link
Contributor Author

@Mic92 still broken on nixpkgs-unstable channel ;/

@Mic92
Copy link
Member

Mic92 commented Apr 24, 2017

@gilligan it seems the channel seems is not up to date.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@gilligan @mention-bot @dimatomp @Mic92 @seanparsons