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.

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

Staging next #47604

Merged
merged 169 commits into from Oct 2, 2018
Merged

Staging next #47604

merged 169 commits into from Oct 2, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Oct 1, 2018

Motivation for this change

https://hydra.nixos.org/eval/1481670?compare=1481626

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

matthewbauer and others added 30 commits July 31, 2018 15:38
This hopefully makes patchShebangs respect cross compilation. It
introduces the concept of the HOST_PATH. Nothing is ever executed on
it but instead used as a way to get the proper path using ‘command
-v’. Needs more testing.

/cc @Ericson2314 @dtzWill

Fixes #33956
Fixes #21138
The ‘mesa-darwin’ stuff was very out of date (2012). This moves darwin
to use the newer mesa. Stuff seems to build okay. Needs more testing
on other stuff though (libraries work). No drivers build but that is
how it should work on macOS.

/cc @cstrahan @Anton-Latukha
Show the filename on unsupported shebang error.
Simplifies debugging packages with large set of scripts.
Turns out the filename is important. It should be `cblas`, not
`openblas-cblas`.
openblas: fix pkg-config alias name
It was reported that the 2nd solution wasn't working as expected because
it was ran in the wrong phase.

This commit creates a new phase, in between the installCheckPhase and distPhase.
https://www.sudo.ws/stable.html

(may need to scroll to the 1.8.25 notes
afternewer versions are released)
Works similarly to `enableParallelBuilding`, but is set by default when
`enableParallelBuilding` is set. In my experience most packages that build
fine in parallel also check fine in parallel.
vala: 0.34.17 -> 0.34.18, 0.36.13 -> 0.36.15, 0.38.9 -> 0.38.10, 0.40.6 -> 0.40.9
stdenv: implement enableParallelChecking option
patch-shebangs: respect cross compilation
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libdrm
54282b9 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.
mesa: remove darwin-specific derivations
xeji and others added 7 commits September 25, 2018 12:10
coreutils: try 8.30 again, fix bootstrap tools expression motivating revert before
numpy, scipy: Fix some nativeBuildInputs
This causes problems for packages built using a bootstrap stdenv,
resulting in references to /bin/sh or even bootstrap-tools. The darwin
stdenv is much stricter about what requisites/references are allowed but
using /bin/sh on linux is also undesirable.

eg. https://hydra.nixos.org/build/81754896

    $ nix-build -A xz
    $ head -n1 result-bin/bin/xzdiff
    #!/nix/store/yvc7kmw98kq547bnqn1afgyxm8mxdwhp-bootstrap-tools/bin/sh

This reverts commit f069423.
@LnL7
Copy link
Member Author

LnL7 commented Oct 1, 2018

A bunch of the darwin failures are cause by a builder that ran out of disk space, restarting all the failed builds to get a better overview.

ld: not enough disk space for writing 'dblat1' for architecture x86_64

As in the other cases, I didn't care about passing the dependency
if unused...
It's a bit weird that noone's noticed,
but I guess it's because of a merge or rebase.
@FRidh
Copy link
Member

FRidh commented Oct 2, 2018

Will this go into 18.09 as well? If so, how?

@FRidh FRidh merged commit 4d1abc4 into master Oct 2, 2018
@LnL7
Copy link
Member Author

LnL7 commented Oct 2, 2018

Oh, was this good already?

@FRidh
Copy link
Member

FRidh commented Oct 2, 2018

Don't know, really. There weren't many rebuilds left, and considering changes have been in there for a month I don't care so much if it breaks stuff; at that point whoever broke stuff should have already stepped up and reverted.

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

Successfully merging this pull request may close these issues.

None yet