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

WIP: Roundup 14 #21335

Merged
merged 8 commits into from
Dec 21, 2016
Merged

WIP: Roundup 14 #21335

merged 8 commits into from
Dec 21, 2016

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Dec 21, 2016

Motivation for this change

#21289

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@grahamc, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ChongLi, @oxij and @lsix to be potential reviewers.

# XSA-197
# they didn't apply, and there are plenty of other patches here
# to get this deployed as-is.
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NeQuissimus I found surprises today :P I've been missing these for ages.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow... Are they separate?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry? I don't understand.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol, I don't know anymore what I meant either :D

# XSA-197
# they didn't apply, and there are plenty of other patches here
# to get this deployed as-is.
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow... Are they separate?

@@ -19,11 +19,11 @@ with lib;

stdenv.mkDerivation rec {
name = "samba-${version}";
version = "4.4.6";
version = "4.4.8";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still want this given that b0a1028 is in staging?

@grahamc
Copy link
Member Author

grahamc commented Dec 21, 2016 via email

@grahamc grahamc merged commit 4d26238 into NixOS:master Dec 21, 2016
@grahamc grahamc deleted the roundup-14 branch December 21, 2016 21:15
@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
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

8 participants