diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-04 13:46:20 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-04 17:17:26 -0800 |
| commit | 936fdc7b68335a32b6c29df774044d46d46ff2ca (patch) | |
| tree | 70e1aeed1c214c904005c847ef8cca236152d79a /pkgs/top-level | |
| parent | e15cd2375e534ae31c85962210ecb88630ff5f0a (diff) | |
| download | nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.gz nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.bz2 nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.lz nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.xz nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.tar.zst nixlib-936fdc7b68335a32b6c29df774044d46d46ff2ca.zip | |
samba4: 4.1.17 -> 4.2.0 YOLO
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e8b54238bd..94067db2d4aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8304,11 +8304,11 @@ let samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { + #glusterfs = null; # Broken in the current build + libgcrypt = libgcrypt_1_6; + libiconv = if stdenv.isLinux then null else libiconv; python = python2; pythonPackages = python2Packages; - libiconv = if stdenv.isLinux then null else libiconv; - libgcrypt = libgcrypt_1_6; - glusterfs = null; # Broken in the current build }; samba = samba4; @@ -8328,7 +8328,7 @@ let samba4_light = lowPrio (samba4.override { # source3/wscript optionals - heimdal = null; + kerberos = null; openldap = null; cups = null; pam = null; @@ -8336,7 +8336,6 @@ let acl = null; libaio = null; fam = null; - ctdb = null; ceph = null; glusterfs = null; |