diff options
| author | Dima <dgoldin+github@protonmail.ch> | 2019-10-15 14:33:08 +0200 |
|---|---|---|
| committer | Lassulus <github@lassul.us> | 2019-11-26 19:56:16 +0100 |
| commit | 0541d071af0231d5f12b12d49ddea950c8023c0d (patch) | |
| tree | 285ee048d1b642470ec63daa32861623455c2fe8 /pkgs/top-level | |
| parent | 201defc4bf4ef96459878bab4d07ccd6fc017e05 (diff) | |
| download | nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.tar nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.tar.gz nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.tar.bz2 nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.tar.lz nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.tar.xz nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.tar.zst nixpkgs-0541d071af0231d5f12b12d49ddea950c8023c0d.zip | |
samba3, fusesmb: removing
Samba 3 has been discontinued since Q1/2015. So I think it's time to just wipe it from the pkgs. FuseSMB is pretty much abandoned, upstream does not exist and it's also not as useful as it used to be anyways.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
2 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e8a02b18b0f..61645c41986 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -117,6 +117,7 @@ mapAliases ({ foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 + fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 @@ -339,6 +340,8 @@ mapAliases ({ s6PortableUtils = s6-portable-utils; # added 2018-07-23 sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 + samba3 = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15 + samba3_light = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c47e8441e5..721bc1c6718 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6398,8 +6398,6 @@ in syntex = callPackage ../tools/graphics/syntex {}; - fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; - sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; socat = callPackage ../tools/networking/socat { }; @@ -15568,8 +15566,6 @@ in deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; - samba3 = callPackage ../servers/samba/3.x.nix { }; - samba4 = callPackage ../servers/samba/4.x.nix { rpcgen = netbsd.rpcgen; python = python3; @@ -15577,17 +15573,6 @@ in samba = samba4; - # A lightweight Samba 3, useful for non-Linux-based OSes. - samba3_light = lowPrio (samba3.override { - pam = null; - fam = null; - cups = null; - acl = null; - openldap = null; - # libunwind 1.0.1 is not ported to GNU/Hurd. - libunwind = null; - }); - samba4Full = lowPrio (samba4.override { enableLDAP = true; enablePrinting = true; |