summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <ajs124@users.noreply.github.com>2022-01-28 00:08:21 +0100
committerGitHub <noreply@github.com>2022-01-28 00:08:21 +0100
commitdff905b0847b11280c07dec9fb6959a9596d8d14 (patch)
tree4a6eddbb3ba4737ad627054b5945205846386052
parentfef09da9973bad931741a6e0a48fe68535a840eb (diff)
parentde5bdb94f355b03a34019c34905affc3310cf113 (diff)
downloadnixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.tar
nixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.tar.gz
nixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.tar.bz2
nixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.tar.lz
nixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.tar.xz
nixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.tar.zst
nixpkgs-dff905b0847b11280c07dec9fb6959a9596d8d14.zip
Merge pull request #157059 from helsinki-systems/drop/softether_4_25
softether_4_25: drop
-rw-r--r--pkgs/servers/softether/4.25.nix53
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 0 insertions, 54 deletions
diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix
deleted file mode 100644
index f22bd0859ad..00000000000
--- a/pkgs/servers/softether/4.25.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib, stdenv, fetchurl
-, openssl, readline, ncurses, zlib
-, dataDir ? "/var/lib/softether" }:
-
-let
-  os = if stdenv.isLinux then "1"
-       else if stdenv.isFreeBSD then "2"
-       else if stdenv.isSunOS then "3"
-       else if stdenv.isDarwin then "4"
-       else if stdenv.isOpenBSD then "5"
-       else "";
-  cpuBits = if stdenv.is64bit then "2" else "1";
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "softether";
-  version = "4.25";
-  build = "9656";
-  compiledDate = "2018.01.15";
-
-  src = fetchurl {
-    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
-    sha256 = "1y1m8lf0xfh7m70d15wj2jjf5a5qhi3j49ciwqmsscsqvb1xwimr";
-  };
-
-  buildInputs = [ openssl readline ncurses zlib ];
-
-  preConfigure = ''
-      echo "${os}
-      ${cpuBits}
-      " | ./configure
-      rm configure
-  '';
-
-  buildPhase = ''
-      mkdir -p $out/bin
-      sed -i \
-          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
-          -e "/_DIR=/s|/usr|${dataDir}|g" \
-          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
-          -e "/echo/s|echo $out/|echo |g" \
-          Makefile
-  '';
-
-  meta = with lib; {
-    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
-    homepage = "https://www.softether.org/";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.rick68 ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d711a69902..77dc90840a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21638,7 +21638,6 @@ with pkgs;
 
   openfire = callPackage ../servers/xmpp/openfire { };
 
-  softether_4_25 = callPackage ../servers/softether/4.25.nix { openssl = openssl_1_0_2; };
   softether_4_29 = callPackage ../servers/softether/4.29.nix { };
   softether = softether_4_29;