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 #60491

Merged
merged 172 commits into from May 7, 2019

Conversation

@FRidh
Copy link
Member

commented Apr 30, 2019

Motivation for this change
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.

dtzWill and others added some commits Mar 26, 2019

llvmPackages: keep darwin at llvm5
My previous attempts to bump the Darwin stdenv version didn't
seem to work, but AFAIK doing so should be straightforward
for anyone with a Darwin builder and the interest in tackling this.

While not the preferred solution, adding a conditional lets us move on,
as we missed 6 entirely due to no one getting around to resolving the
Darwin bootstrap accordingly.
utils.bash: allow response files in bootstrapping
llvm uses response files in bootstrapping. It’s okay for them to
happen even though we don’t use expandResponseParams here right now.
networkmanager: 1.16.0 -> 1.18.0
* build w/iwd support since it's free (no dep required!)
* move to iputils for minor utilities, instead of inetutils
* parallel building :)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/raw/1.18.0/NEWS
Merge pull request #60164 from worldofpeace/pygobject-bump
 python3Packages.pygobject3: 3.32.0 -> 3.32.1,  pythonPackages.pycairo: 1.18.0 -> 1.18.1
Merge pull request #60096 from worldofpeace/asyncssh-bump
pythonPackages.asyncssh: 1.15.1 -> 1.16.1
@FRidh

This comment has been minimized.

Copy link
Member Author

commented May 1, 2019

@peti GHC 8.6.5 fails on staging-next. Could you have a look?
https://hydra.nixos.org/build/92947674

FRidh and others added some commits May 1, 2019

@FRidh

This comment has been minimized.

Copy link
Member Author

commented May 2, 2019

cc @basvandijk for GHC

@peti

This comment has been minimized.

Copy link
Member

commented May 2, 2019

@FRidh

This comment has been minimized.

Copy link
Member Author

commented May 3, 2019

llvm 7 failure on aarch
https://hydra.nixos.org/build/92951911

@matthewbauer

This comment has been minimized.

Copy link
Member

commented May 3, 2019

@FRidh we're seeing two issues with the new macOS stuff:

I'll have some time this weekend to work on it

@FRidh FRidh referenced this pull request May 4, 2019

Merged

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

0 of 10 tasks complete
@LnL7

This comment has been minimized.

Copy link
Member

commented May 4, 2019

There's also a problem with llvm 7.1 on darwin, blocking rustc. Since the queue is completely empty I would propose to merge both #60849 and #60912 first.

@FRidh

This comment has been minimized.

Copy link
Member Author

commented May 4, 2019

@LnL7 go for it

@FRidh

This comment has been minimized.

Copy link
Member Author

commented May 4, 2019

Afterwards I do want to merge this with master so we can go to the next batch of updates (staging).

LnL7 and others added some commits May 4, 2019

llvm: fix llvm-config on darwin
With 7.1 llvm-config looks for libLLVM-7.1.dylib, but the shortVersion
was still 7 so only 7 and 7.1.0 where aliased before.

	$ llvm-config --link-shared
	llvm-config: error: libLLVM-7.1.dylib is missing
llvm: create all versioned symlinks for libLLVM on darwin
Apply eb31e48 to older versions where applicable.
@FRidh

This comment has been minimized.

Copy link
Member Author

commented May 4, 2019

Merged #60912 into staging-next but not #60849; to do a full linux rebuild as well seems a bit extreme.

@FRidh FRidh merged commit a80982b into master May 7, 2019

13 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details

@veprbl veprbl referenced this pull request May 7, 2019

Open

folly: support macOS #59846

3 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.