summary refs log tree commit diff
diff options
context:
space:
mode:
authorRick Yang <rick68@gmail.com>2022-01-28 14:05:03 +0800
committerRick Yang <rick68@gmail.com>2022-02-03 01:04:27 +0800
commitcbb34c531c649fad10ef15237281dcad116340fa (patch)
treee2db2d9aa5a4b26c23f90c11365cced0a5729765
parent55f827a0dbb8708426bf924fb63e58c5fc4e33a3 (diff)
downloadnixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.tar
nixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.tar.gz
nixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.tar.bz2
nixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.tar.lz
nixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.tar.xz
nixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.tar.zst
nixpkgs-cbb34c531c649fad10ef15237281dcad116340fa.zip
softether: 4.29 -> 4.38
-rw-r--r--pkgs/servers/softether/default.nix (renamed from pkgs/servers/softether/4.29.nix)22
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/default.nix
index 83eb3b05b37..2f80afc3701 100644
--- a/pkgs/servers/softether/4.29.nix
+++ b/pkgs/servers/softether/default.nix
@@ -4,28 +4,28 @@
 
 stdenv.mkDerivation rec {
   pname = "softether";
-  version = "4.29";
-  build = "9680";
+  version = "4.38";
+  build = "9760";
 
   src = fetchurl {
     url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz";
-    sha256 = "1r169s5dr31060r2mxkmm08riy6zrxgapmrc6kdrpxdav6kmy0z6";
+    sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6";
   };
 
   buildInputs = [ openssl readline ncurses zlib ];
 
   preConfigure = ''
-      ./configure
+    ./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
+    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; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 266a2c92a54..8865b7cdfc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21797,8 +21797,7 @@ with pkgs;
 
   openfire = callPackage ../servers/xmpp/openfire { };
 
-  softether_4_29 = callPackage ../servers/softether/4.29.nix { };
-  softether = softether_4_29;
+  softether = callPackage ../servers/softether { };
 
   qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };