Skip to content

Staging next#60491

Merged
FRidh merged 172 commits intomasterfrom
staging-next
May 7, 2019
Merged

Staging next#60491
FRidh merged 172 commits intomasterfrom
staging-next

Conversation

@FRidh
Copy link
Copy Markdown
Member

@FRidh FRidh 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 30 commits March 26, 2019 18:27
@dtzWill
gnulib: 20180226 -> 20190326
f7505ee
@dtzWill @matthewbauer
llvmPackages: 5 -> 7 (bump our default LLVM)
d4ff231
@dtzWill @matthewbauer
llvmPackages: keep darwin at llvm5
dd649a0 
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.
@dtzWill @matthewbauer
all-packages.nix: remove llvm7 overrides, this is now the default
564bf8d
@dtzWill @matthewbauer
all-packages: keep llvm7 overrides for now, not default on Darwin yet
4c3c8f4
@matthewbauer
Revert "Revert "darwin 10.12 commits""
d69cc77 
This reverts commit 8505e71.
@matthewbauer
darwin: move to llvm7
ae1e940
@matthewbauer
utils.bash: allow response files in bootstrapping
5fad67d 
llvm uses response files in bootstrapping. It’s okay for them to
happen even though we don’t use expandResponseParams here right now.
@dtzWill
networkmanager: 1.16.0 -> 1.18.0
b053777 
* 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
@lo1tuma
libuv: 1.27.0 -> 1.28.0
a66d273
@lo1tuma
nodejs-12_x: init at 12.0.0
4ddbac7
@worldofpeace
pythonPackages.asyncssh: 1.15.1 -> 1.16.1
a39bb0f 
https://github.com/ronf/asyncssh/blob/master/docs/changes.rst#release-1161-30-mar-2019
@worldofpeace
python3Packages.pygobject3: 3.32.0 -> 3.32.1
de76c1b 
https://gitlab.gnome.org/GNOME/pygobject/blob/3.32.1/NEWS
@worldofpeace
pythonPackages.pycairo: 1.18.0 -> 1.18.1
6be3f7f 
https://pycairo.readthedocs.io/en/latest/changelog.html#v1-18-1
@worldofpeace
Merge pull request #60164 from worldofpeace/pygobject-bump
6be5aa4 
 python3Packages.pygobject3: 3.32.0 -> 3.32.1,  pythonPackages.pycairo: 1.18.0 -> 1.18.1
@FRidh
Merge staging-next into staging
ff9af96
@worldofpeace
Merge pull request #60096 from worldofpeace/asyncssh-bump
76e7783 
pythonPackages.asyncssh: 1.15.1 -> 1.16.1
@FRidh
python: Wand: 0.5.2 -> 0.5.3
137311d
@FRidh
python: ansible-runner: 1.3.2 -> 1.3.3
529fe39
@FRidh
python: atomman: 1.2.5 -> 1.2.6
534ee33
@FRidh
python: azure-common: 1.1.18 -> 1.1.19
fa83291
@FRidh
python: cffi: 1.12.2 -> 1.12.3
9f4e663
@FRidh
python: cx_Oracle: 7.1.2 -> 7.1.3
f665735
@FRidh
python: cypari2: 2.1.0 -> 2.1.1
2d0a2ac
@FRidh
python: django-silk: 3.0.1 -> 3.0.2
5631b37
@FRidh
python: ecdsa: 0.13 -> 0.13.2
7b6b529
@FRidh
python: genanki: 0.6.3 -> 0.6.4
76c32df
@FRidh
python: gsd: 1.6.1 -> 1.6.2
aefc5de
@FRidh
python: httplib2: 0.12.1 -> 0.12.3
b84525d
@FRidh
python: j2cli: 0.3.6.post1 -> 0.3.7
f2aee56
@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 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 Apr 30, 2019
@FRidh
Copy link
Copy Markdown
Member Author

FRidh 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
Copy link
Copy Markdown
Member Author

FRidh commented May 2, 2019

cc @basvandijk for GHC

@peti
Copy link
Copy Markdown
Member

peti commented May 2, 2019 via email

@FRidh
Copy link
Copy Markdown
Member Author

FRidh commented May 3, 2019

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

@matthewbauer
Copy link
Copy Markdown
Member

matthewbauer 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 mentioned this pull request May 4, 2019
Merged
10 tasks
@LnL7
Copy link
Copy Markdown
Member

LnL7 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
Copy link
Copy Markdown
Member Author

FRidh commented May 4, 2019

@LnL7 go for it

@FRidh
Copy link
Copy Markdown
Member Author

FRidh 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 3 commits May 4, 2019 17:32
@LnL7 @FRidh
llvm: fix llvm-config on darwin
807ba5f 
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
@LnL7 @FRidh
llvm: create all versioned symlinks for libLLVM on darwin
626a95a 
Apply eb31e48 to older versions where applicable.
@FRidh
Merge master into staging-next
193b899
@FRidh
Copy link
Copy Markdown
Member Author

FRidh 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
@veprbl veprbl mentioned this pull request May 7, 2019
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees

No one assigned

Labels

6.topic: emacs Text editor 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.