Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9e804ba5bfa2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48856a91c02b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 23, 2018

  1. wine: disable bindnow hardening 

    (cherry picked from commit ba960ac)
    @xzfc @dezgeg
    xzfc authored and dezgeg committed Mar 23, 2018
    Copy the full SHA
    cdb9735 View commit details

  2. systemd: use stable tree 

    This fixes a bug with changed qemu network interface names and also generally
should be preferred to using a release tag.

(cherry picked from commit 6b9771e)
    @abbradar @fpletz
    abbradar authored and fpletz committed Mar 23, 2018
    Copy the full SHA
    48856a9 View commit details
Showing with 8 additions and 2 deletions.
  1. +4 −0 pkgs/misc/emulators/wine/base.nix
  2. +4 −2 pkgs/os-specific/linux/systemd/default.nix
4 changes: 4 additions & 0 deletions pkgs/misc/emulators/wine/base.nix
View file
Original file line number Diff line number Diff line change
@@ -103,6 +103,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {

enableParallelBuilding = true;

# https://bugs.winehq.org/show_bug.cgi?id=43530
# https://github.com/NixOS/nixpkgs/issues/31989
hardeningDisable = [ "bindnow" ];

passthru = { inherit pkgArches; };
meta = {
inherit version platforms;
6 changes: 4 additions & 2 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,13 @@ in stdenv.mkDerivation rec {
version = "238";
name = "systemd-${version}";

# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
# Also fresh patches should be cherry-picked from that tree to our current one.
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
rev = "243d65d38f2df82d4a39f6a9970337803dff65a1";
sha256 = "098hxlkh6q17rxa178adylksxnnd4x9rxb8amjnlbiydcc6kaa5n";
rev = "3a439bcdb5706dbb44215ef4e70f07b09aaac040";
sha256 = "0qkk5891068pkxmxqvm07bwl597i8lfp89c23yxp11m21cjq0f4b";
};

outputs = [ "out" "lib" "man" "dev" ];