From cbb34c531c649fad10ef15237281dcad116340fa Mon Sep 17 00:00:00 2001 From: Rick Yang Date: Fri, 28 Jan 2022 14:05:03 +0800 Subject: [PATCH] softether: 4.29 -> 4.38 --- .../softether/{4.29.nix => default.nix} | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 12 insertions(+), 13 deletions(-) rename pkgs/servers/softether/{4.29.nix => default.nix} (65%) diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/default.nix similarity index 65% rename from pkgs/servers/softether/4.29.nix rename to pkgs/servers/softether/default.nix index 83eb3b05b37f..2f80afc3701b 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 266a2c92a542..8865b7cdfc15 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 { };