Merge pull request #68669 from WilliButz/remove-sambaMaster

sambaMaster: remove outdated package
This commit is contained in:
Jörg Thalheim 2019-09-13 16:57:11 +01:00 committed by GitHub
commit 2a23a79719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 31 deletions

View file

@ -1,29 +0,0 @@
{ fetchFromGitHub
, samba4
, nettle
} :
(samba4.overrideAttrs(oldAttrs: rec {
name = "samba-unstable-${version}";
version = "2018-03-09";
src = fetchFromGitHub {
owner = "samba-team";
repo = "samba";
rev = "9e954bcbf43d67a18ee55f84cda0b09028f96b92";
sha256 = "07j1pwm4kax6pq21gq9gpmp7dhj5afdyvkhgyl3yz334mb41q11g";
};
# Remove unnecessary install flags, same as <4.8 patch
postPatch = oldAttrs.postPatch + ''
sed -i '423,433d' dynconfig/wscript
'';
patches = [ ./4.x-no-persistent-install.patch ];
buildInputs = [ nettle ] ++ oldAttrs.buildInputs;
meta.branch = "master";
})).override {
# samba4.8+ removed the ability to disable LDAP.
# Enable for base derivation here:
enableLDAP = true;
}

View file

@ -317,6 +317,7 @@ mapAliases ({
s6PortableUtils = s6-portable-utils; # added 2018-07-23
sagemath = sage; # added 2018-10-27
sam = deadpixi-sam; # added 2018-04-25
sambaMaster = throw "removed 2019-09-13: outdated and no longer needed";
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02

View file

@ -15113,8 +15113,6 @@ in
python = python3;
};
sambaMaster = callPackage ../servers/samba/master.nix { };
samba = samba4;
# A lightweight Samba 3, useful for non-Linux-based OSes.