diff options
| author | Jรถrg Thalheim <Mic92@users.noreply.github.com> | 2019-09-13 16:57:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 16:57:11 +0100 |
| commit | 2a23a79719e0380f405765364045e7385d734800 (patch) | |
| tree | 785f69ccfa515b575bd7a3f2eb41f0dc37ddb31f | |
| parent | a4bea6db8b428309b1e8d33087b778625fac4dfb (diff) | |
| parent | cec85241129a2716ca6af34260fe4fe189080bb6 (diff) | |
Merge pull request #68669 from WilliButz/remove-sambaMaster
sambaMaster: remove outdated package
| -rw-r--r-- | pkgs/servers/samba/master.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 1 insertions, 31 deletions
diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix deleted file mode 100644 index 21038a0f218..00000000000 --- a/pkgs/servers/samba/master.nix +++ /dev/null @@ -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; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ac88446242e..d2d438cf099 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e8b13c687e..18bbffda71f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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. |