Skip to content

Staging next#51444

Merged
FRidh merged 590 commits intomasterfrom
staging-next
Dec 19, 2018
Merged

Staging next#51444
FRidh merged 590 commits intomasterfrom
staging-next

Conversation

@FRidh
Copy link
Member

@FRidh FRidh commented Dec 3, 2018

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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 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: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 6.topic: xfce The Xfce Desktop Environment 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 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-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 3, 2018
@GrahamcOfBorg GrahamcOfBorg removed 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 6.topic: xfce The Xfce Desktop Environment 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 8, 2018
@pbogdan pbogdan mentioned this pull request Dec 9, 2018
Merged
10 tasks
@hedning hedning mentioned this pull request Dec 9, 2018
Closed
@nyanloutre
Copy link
Member

nyanloutre commented Dec 10, 2018

There is a breakage introduced by the pyqt update (5.10 -> 5.11), the sip package must be handeled differently to be able to import the module.

I did some investigation here : #49400 (comment)

@copumpkin
botocore: 1.12.48 -> 1.12.62
8285475 
boto3: 1.9.36 -> 1.9.62
awscli: 1.16.72

I update all three of these at a time because they rely on each other
and get annoyed when such changes are non-atomic. Also added a note to
the packages telling people that this is needed. I tested awscli and the
libraries against a real account.
@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Dec 10, 2018
dotlambda referenced this pull request Dec 12, 2018
@edef1c
doh-proxy: stick with Python 3.6 for now
f9b0781 
It currently breaks on Python 3.7 due to `async` becoming a reserved keyword
@Mic92 Mic92 mentioned this pull request Dec 12, 2018
Closed
13 tasks
@grahamc
Copy link
Member

grahamc commented Dec 14, 2018

I'm noticing the staging jobset on hydra hasn't run since November 27 ,and it hasn't even finished. Is there a jobset I don't know about? I'm concerned maybe something has broken in the shuffle here.

@grahamc
Copy link
Member

grahamc commented Dec 14, 2018

Answer, yes: https://hydra.nixos.org/jobset/nixpkgs/staging-next :)

@copumpkin
Copy link
Member

copumpkin commented Dec 18, 2018

@FRidh is this merge likely to happen soon? I'm waiting for the awscli/boto3/botocore updates and might manually transplant them over to master if this branch is going to take a while. There's no fundamental reason I think to bundle those with the rest of these updates, right?

@FRidh
Copy link
Member Author

FRidh commented Dec 18, 2018

Just merged master into staging-next again.

@GrahamcOfBorg GrahamcOfBorg removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Dec 18, 2018
@FRidh FRidh merged commit 1a51abe into master Dec 19, 2018
@FRidh
Copy link
Member Author

FRidh commented Dec 19, 2018

Seems like there were more recent changes that had not been rebuild as we have a mass-rebuild on master now.

@hedning
Copy link
Contributor

hedning commented Dec 19, 2018

Looks like it comes from here: #51960, probably targeted at master by a mistake.

@timokau timokau mentioned this pull request Dec 20, 2018
Closed
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

@infinisil infinisil Awaiting requested review from infinisil

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@peti peti Awaiting requested review from peti

@ryantm ryantm Awaiting requested review from ryantm

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@zimbatm zimbatm Awaiting requested review from zimbatm

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 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-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-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.