Merge master into staging #58106
Merged
Merge master into staging #58106
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lsd: 0.13.0 -> 0.14.0
Newer versions of Futhark only care about this executable, and the others are thin wrappers that will go away in a future version.
vscode-extensions.{language-haskell,hie-server}: init
…ffib python37Packages.xcffib: 0.6.0 -> 0.7.0
zoneminder: add some of the missing ONVIF dependencies
shairplay: 2016-01-01 -> 2018-08-24 and add avahi-compat convenience derivation
broadlink-cli: init at 0.9
mpw: point upgrade and minor cleanups
Yesterday we had a discussion about several Hydra-related problems in the #nixos IRC channel[1], as a result a lot of stalled PRs were merged. I think that we want to use the latest Hydra now as it contains lots of new fixes and folks mentioned that they want to use a self-hosted Hydra, so they probably use the `nixpkgs` package rather than the expressions from `NixOS/hydra`. Simply moving to 2019-03-18 should be fine for now as Hydra doesn't have a release model. [1] https://logs.nix.samueldr.com/nixos/2019-03-17#2048416;
coqPackages.QuickChick: 1.0.2 -> 20190311
kalbasit
requested review from
Ericson2314,
FRidh,
infinisil,
nbp,
peti,
Profpatsch,
thoughtpolice,
ttuegel and
zimbatm
as code owners
GrahamcOfBorg
added
6.topic: emacs
6.topic: GNOME
|
I pushed this directly to staging rather than merging the PR. This is just for the record. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
There's currently a conflict between master and staging, that's because both 393b359 by @matthewbauer and 111e42e by @dtzWill modified the same patch located at
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch. I tested this merge by buildingplasma-workspace, and I manually verified both sides of the patch looks good. The only conflict was:cc @vcunat
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)