Skip to content

lz4: pick upstream fix for Darwin, move to pname#60849

Merged
FRidh merged 1 commit intoNixOS:stagingfrom
dtzWill:fix/lz4-1.9.1-darwin
May 4, 2019
Merged

lz4: pick upstream fix for Darwin, move to pname#60849
FRidh merged 1 commit intoNixOS:stagingfrom
dtzWill:fix/lz4-1.9.1-darwin

Conversation

@dtzWill
Copy link
Copy Markdown
Member

@dtzWill dtzWill commented May 3, 2019

Motivation for this change

#59812 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 3, 2019
@matthewbauer
Copy link
Copy Markdown
Member

I think we can put this directly in staging-next? Not sure what the process is, but the breakage happens on both staging-next and staging. /cc @FRidh

@FRidh
Copy link
Copy Markdown
Member

FRidh commented May 3, 2019

Let's not, as it will cause a large rebuild again.

@matthewbauer
Copy link
Copy Markdown
Member

Let's not, as it will cause a large rebuild again.

Perhaps, but it might be necessary to make sure dependencies of lz4 aren't broken for other reasons.

@dtzWill
Copy link
Copy Markdown
Member Author

dtzWill commented May 4, 2019

We could maybe make the change only cause the rebuilds on Darwin, = if !stdenv.hostPlatform.isDarwin then null else fetchpatch... with a note to simplify on next rebuild?

If it is currently broken, for Darwin these aren't rebuilds.. just "builds" :)

@FRidh
Copy link
Copy Markdown
Member

FRidh commented May 4, 2019

Yes. Note there is more Darwin stuff broken:
#60491 (comment)

@LnL7 LnL7 mentioned this pull request May 4, 2019
10 tasks
@FRidh FRidh merged commit 1b0cd28 into NixOS:staging May 4, 2019
@matthewbauer
Copy link
Copy Markdown
Member

@FRidh This one is holding up nixpkgs-unstable:

https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents

Could we cherry pick it?

@FRidh
Copy link
Copy Markdown
Member

FRidh commented May 9, 2019

This should be in staging-next by now. If it's a mass-rebuild we shouldn't cherry-pick to master.

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

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants