diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:02:21 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:02:21 +0100 |
commit | 10d0c68a9bb90f65684cd23ce96e93610f42a376 (patch) | |
tree | 69d35d6d434969af02e6bc6e3d7e0fb1308f4d1f /pkgs/tools/networking | |
parent | a20dd9528b38dd02c4bf8e25f5f9e12fc9573f9f (diff) | |
parent | 65edeb8633de16792a84195f77a6b4ea408e2608 (diff) | |
download | nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.gz nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.bz2 nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.lz nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.xz nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.zst nixlib-10d0c68a9bb90f65684cd23ce96e93610f42a376.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/croc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/tinyfecvpn/default.nix | 37 |
2 files changed, 40 insertions, 3 deletions
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 5a63581a28d6..de664fe0b7d3 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "croc"; - version = "6.2.3"; + version = "6.4.1"; goPackagePath = "github.com/schollz/croc"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "13z3k0s7piwxxh87f04ldvxsd664jncwgmin397v5152bxadbgxp"; + sha256 = "0sil1gxml4p4yysm8x6bpv5m0hvw4ss27b4c9wdag06lav0g4am0"; }; - modSha256 = "0d9xhlszgy839naj4v2l613sn3nckx87cwwz1sh1rjwxarp8gqa9"; + modSha256 = "1w84xqnn9fnkakak6j069app4ybbxpwq79g8qypwvmqg5bhvzywg"; subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix new file mode 100644 index 000000000000..aab937c994ee --- /dev/null +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "tinyfecvpn"; + version = "20180820.0"; + + src = fetchFromGitHub { + owner = "wangyu-"; + repo = pname; + rev = version; + sha256 = "1mbb9kzvy24na375dz0rlf5k93gan1vahamc9wzkn34mcx8i97cs"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; + + patchPhase = '' + runHook prePatch + find . -type f -name "makefile" -exec sed "s/ -static/ -g/g" -i \{\} \; + runHook postPatch + ''; + + installPhase = '' + runHook preInstall + install -Dm755 tinyvpn $out/bin/tinyvpn + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/wangyu-/tinyfecVPN"; + description = "A VPN Designed for Lossy Links, with Build-in Forward Error Correction(FEC) Support"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} |