diff options
-rw-r--r-- | nixos/modules/programs/shadow.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls/3.3.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls/3.4.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/gnutls/3.5.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 4 |
5 files changed, 10 insertions, 25 deletions
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 6398509357a6..878c9cc0cf09 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -103,10 +103,9 @@ in }; security.setuidPrograms = [ "su" "chfn" ] + ++ [ "newuidmap" "newgidmap" ] # new in shadow 4.2.x ++ lib.optionals config.users.mutableUsers - [ "passwd" "sg" "newgrp" - "newuidmap" "newgidmap" # new in shadow 4.2.x - ]; + [ "passwd" "sg" "newgrp" ]; }; diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix index c314da388dce..86262d4aef23 100644 --- a/pkgs/development/libraries/gnutls/3.3.nix +++ b/pkgs/development/libraries/gnutls/3.3.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.3.18"; + version = "3.3.24"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz"; - sha256 = "15ckyblhkap3d4sqw0dc9l8wdrnd2aj1fs9m0w0a3bfihvsfg1vs"; + sha256 = "5b65fe2a91c8dfa32bedc78acffcb152e5426cd3349e2afc43cccc9bdaf18aa5"; }; }) diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index 4882e5dda043..2a48d045c515 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,17 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.13"; + version = "3.4.14"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; - sha256 = "0naqs9g5b577j1j7q55ma1vcn78jl2d98h3zrl5rh997wzl8cczx"; + sha256 = "35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23"; }; - - # This fixes some broken parallel dependencies - postPatch = '' - sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am - ''; - - nativeBuildInputs = [ autoreconfHook ]; }) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index 82bd437d721b..db35a13cc411 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,17 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.1"; + version = "3.5.3"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "1gdxr1p1sigigwvangqf3v31i8fda07d6ngawykarhr7ls00yjmw"; + sha256 = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"; }; - - # This fixes some broken parallel dependencies - postPatch = '' - sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am - ''; - - nativeBuildInputs = [ autoreconfHook ]; }) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 1a5931d9828e..b0409ee2808a 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.20"; - ver_min = "8"; + ver_min = "9"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3"; + sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"; }; outputs = [ "dev" "out" ]; |