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

Jump to bottom

Staging next #76705

Merged
merged 720 commits into from Jan 3, 2020
Merged

Staging next #76705

merged 720 commits into from Jan 3, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Dec 30, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@FRidh FRidh mentioned this pull request Dec 30, 2019
Merged
@FRidh
python: thrift: 0.11.0 -> 0.13.0
2ad8a56
@FRidh
python: tld: 0.9.8 -> 0.11.9
99d664e
@FRidh
python: transaction: 2.4.0 -> 3.0.0
f054f49
@FRidh
python: trio: 0.12.1 -> 0.13.0
47d5b81
@FRidh
python: trustme: 0.5.3 -> 0.6.0
576e641
@FRidh
python: twine: 2.0.0 -> 3.1.1
8f969f9
@FRidh
python: Twisted: 19.7.0 -> 19.10.0
c25c1bd
@FRidh
python: typeguard: 2.5.1 -> 2.7.0
49235eb
@FRidh
python: uamqp: 1.2.4 -> 1.2.5
ca567bf
@FRidh
python: uncompyle6: 3.5.1 -> 3.6.0
8162dd7
@FRidh
python: uproot-methods: 0.7.1 -> 0.7.2
eb98971
@FRidh
python: uproot: 3.10.12 -> 3.11.0
c635c3e
@FRidh
python: uritools: 2.2.0 -> 3.0.0
fbf41d4
@FRidh
python: urwid: 2.0.1 -> 2.1.0
65f6f09
@FRidh
python: vcrpy: 2.1.1 -> 3.0.0
58ed83a
@FRidh
python: vega_datasets: 0.7.0 -> 0.8.0
e61ff42
@FRidh
python: venusian: 1.2.0 -> 3.0.0
33f7172
@FRidh
python: PyVirtualDisplay: 0.2.4 -> 0.2.5
a56d2a6
@FRidh
python: virtualenv: 16.7.8 -> 16.7.9
b1aa99f
@FRidh
python: vowpalwabbit: 8.7.0.post1 -> 8.8.0
ae3f44d
@jtojnar
Copy link
Contributor

jtojnar commented Dec 31, 2019

Sorry about creating this mess, I was cherry-picking the compatible changes from #72074 and the did not notice changes in dependent files from master. NIX_* are in fact environment variables so they need to be strings, not arrays (and it is going to be enforced by #72074) – only because of these unnoticed conflicts the eval failed.

I have reverted your fixes and merged staging where proper fixes were introduced:

I have decided to restart the cycle by merging staging here because it also includes lot of build fixes to issues I introduced yesterday, even if they do not impact evaluation.

@ofborg ofborg bot added 6.topic: emacs 6.topic: pantheon The Pantheon desktop environment labels Dec 31, 2019
@jonringer
Copy link
Contributor

sounds good to me, just tryingto get ofborg to eval it

@FRidh
Copy link
Member Author

FRidh commented Dec 31, 2019

Hydra is stuck evaluating staging-next
https://hydra.nixos.org/jobset/nixpkgs/staging-next

@FRidh FRidh mentioned this pull request Jan 1, 2020
Closed
@FRidh FRidh requested a review from infinisil as a code owner January 2, 2020 20:41
@FRidh FRidh merged commit 9ec439e into master Jan 3, 2020
@jonringer
Copy link
Contributor

hurray! I can finally work on stabilizing a bunch of stuff on master :)

@misuzu misuzu mentioned this pull request Jan 3, 2020
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais Awaiting requested review from alyssais

@basvandijk basvandijk Awaiting requested review from basvandijk

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@jonringer jonringer Awaiting requested review from jonringer

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@zimbatm zimbatm Awaiting requested review from zimbatm

@adisbladis adisbladis Awaiting requested review from adisbladis adisbladis is a code owner

@etu etu Awaiting requested review from etu

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: emacs 6.topic: erlang 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: lua 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: xfce The Xfce Desktop Environment 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@FRidh @jonringer @jtojnar @teh @tbenst @veprbl @eadwu @globin @Ma27 @costrouc