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

master -> staging-next #80249

Closed
wants to merge 537 commits into from
Closed

master -> staging-next #80249

wants to merge 537 commits into from

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Feb 16, 2020

Proposing to merge master -> staging to fix ~10 Rust packages via #80153, and also avoid merge conflicts with the treewide no-op #79978

worldofpeace and others added 30 commits February 13, 2020 18:03
rust: Replace migration README with GitHub issue
bino3d: use mkDerivation from qt
nixosTests.nsd: Port to python
google-chrome-unstable won't launch without the following shared object
files: libdrm.so.2 and libgbm.so.1.
gohufont: generate opentype files
chromium: 80.0.3987.87 -> 80.0.3987.100
Signed-off-by: Austin Seipp <aseipp@pobox.com>
gitAndTools.gh: 0.5.4 -> 0.5.5
The bang was missing!  But there's a neater way to do this anyway.
What was there before would still have worked, but I think it would
end up being executed by /bin/sh since it had no shebang line.
The bang was missing!  What was there before would still have worked,
but I think it would end up being executed by /bin/sh since it had no
shebang line.
fftw: Re-enable OpenMP with non-GCC and musl
This upgrade brings a new option to the keyboard-select plugin:

  URxvt.keyboard-select.clipboard: If true, copy to clipboard too

and removes the now deprecated clipboard and url-select plugins. The
reasons for deprecating these two plugins are described at:
https://github.com/muennich/urxvt-perls/blob/master/deprecated/README.md
While the clipboard and url-select plugins have been deprecated, it's
likely there are still many users expecting them to exist, so continue
to provide them.

https://github.com/muennich/urxvt-perls/blob/master/deprecated/README.md
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
@veprbl
Copy link
Member

veprbl commented Feb 16, 2020

@bhipple See https://discourse.nixos.org/t/maintainers-needed-for-merging-staging-staging-next-branches/3833/4

synapse-bt: upgrade cargo fetcher and cargoSha256
@bhipple bhipple changed the base branch from staging to staging-next February 16, 2020 07:47
@bhipple bhipple changed the title master -> staging master -> staging-next Feb 16, 2020
@bhipple
Copy link
Contributor Author

bhipple commented Feb 16, 2020

Are you sure? I changed the target branch from staging to staging-next, but if that's actually how it's supposed to be done, then I think the RFC wording might be out of date?

staging-next is branched from staging and only fixes to stabilize and security fixes shall be delivered to this branch. This branch shall be merged into master when deemed of sufficiently high quality.

This seems to imply that the merge goes master -> staging -> staging-next -> master.

@FRidh
Copy link
Member

FRidh commented Feb 16, 2020

I just merged master into staging, there weren't any conflicts.

@FRidh FRidh closed this Feb 16, 2020
@FRidh
Copy link
Member

FRidh commented Feb 16, 2020

Updates from master are typically merged via staging-next into staging, however, that is not necessary per se, e.g., if there aren't any updates in staging-next (as was the case now) there is no point.

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