summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-15 12:55:39 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-07-15 12:55:39 -0700
commitbe0f468926ff805b9fae4bba87a0fc8b628cbc1a (patch)
treed16b27aa234c286752dfe00673cca699e0c34f85
parent08ef62c1009c27db1c6a5750c80c4af01ee791f2 (diff)
downloadnixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.tar
nixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.tar.gz
nixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.tar.bz2
nixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.tar.lz
nixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.tar.xz
nixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.tar.zst
nixpkgs-be0f468926ff805b9fae4bba87a0fc8b628cbc1a.zip
samba: 4.2.1 -> 4.2.3
-rw-r--r--pkgs/servers/samba/4.x.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1d957a8ec60..1f89e959c4b 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "samba-4.2.1";
+  name = "samba-4.2.3";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
+    sha256 = "0z2c17d2id0m59mfdxdljhizp97l29clmw6g5zp93n0q92pabpxn";
   };
 
   patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38784d7a3b1..232cabe6b93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9178,7 +9178,6 @@ let
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
     kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
-    gnutls = gnutls33;
     # enableLDAP
   };