diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 18:00:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 18:00:58 +0000 |
commit | 9776723357705dedeb933221c8f9b295d44813d7 (patch) | |
tree | 15d5753e5cb6835221543be566b71f0a05dd9860 /pkgs/tools/networking | |
parent | 940180423aaad6f43db3510e9418ced525613d51 (diff) | |
parent | a4e452c906b13806fcea511ab58792d7748203b0 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/clash/default.nix | 49 | ||||
-rw-r--r-- | pkgs/tools/networking/redsocks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/ripmime/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/whois/clang.patch | 11 | ||||
-rw-r--r-- | pkgs/tools/networking/whois/default.nix | 8 |
5 files changed, 6 insertions, 70 deletions
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix deleted file mode 100644 index 6cce7d247a5e5..0000000000000 --- a/pkgs/tools/networking/clash/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, testers -, clash -}: - -buildGoModule rec { - pname = "clash"; - version = "1.18.0"; - - src = fetchFromGitHub { - owner = "Dreamacro"; - repo = pname; - rev = "v${version}"; - hash = "sha256-LqjSPlPkR5sB4Z1pmpdE9r66NN7pwgE9GK4r1zSFlxs="; - }; - - vendorHash = "sha256-EWAbEFYr15RiJk9IXF6KaaX4GaSCa6E4+8rKL4/XG8Y="; - - # Do not build testing suit - excludedPackages = [ "./test" ]; - - CGO_ENABLED = 0; - - ldflags = [ - "-s" - "-w" - "-X github.com/Dreamacro/clash/constant.Version=${version}" - ]; - - checkFlags = [ - "-skip=TestParseRule" # Flaky tests - ]; - - passthru.tests.version = testers.testVersion { - package = clash; - command = "clash -v"; - }; - - meta = with lib; { - description = "A rule-based tunnel in Go"; - homepage = "https://dreamacro.github.io/clash/"; - changelog = "https://github.com/Dreamacro/clash/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ contrun Br1ght0ne ]; - mainProgram = "clash"; - }; -} diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index 9b8989f30c2ac..cebec2cb2b60c 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Transparent redirector of any TCP connection to proxy"; - homepage = "http://darkk.net.ru/redsocks/"; + homepage = "https://darkk.net.ru/redsocks/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.ekleog ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 6584edca5e689..7cfb31ff9858b 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ripmime"; version = "1.4.0.10"; src = fetchurl { - url = "http://www.pldaniels.com/${pname}/${pname}-${version}.tar.gz"; + url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9"; }; @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; - homepage = "http://www.pldaniels.com/ripmime/"; + homepage = "https://pldaniels.com/ripmime/"; platforms = platforms.all; }; passthru = { updateInfo = { - downloadPage = "http://www.pldaniels.com/ripmime/"; + downloadPage = "https://pldaniels.com/ripmime/"; }; }; } diff --git a/pkgs/tools/networking/whois/clang.patch b/pkgs/tools/networking/whois/clang.patch deleted file mode 100644 index 3091b9a3eee34..0000000000000 --- a/pkgs/tools/networking/whois/clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/utils.h -+++ b/utils.h -@@ -15,7 +15,7 @@ - #endif - - /* Portability macros */ --#ifdef __GNUC__ -+#if defined __GNUC__ && ! defined __clang__ - # define NORETURN __attribute__((noreturn)) - # define MALLOC_FREE __attribute__((malloc(free))) - # define NONNULL __attribute__((returns_nonnull)) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 465ab76501378..fe4950d5c2407 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,20 +1,16 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.19"; + version = "5.5.20"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-4mFn5cY7ipAU4vOiHC2s69fxYJwShQEQ1eA8t5JvOP0="; + hash = "sha256-0vQ6GBBtNA6Phlqhl3NZvEJqoyZ1um7VdkpsIRKhsm4="; }; - patches = [ - ./clang.patch - ]; - nativeBuildInputs = [ perl gettext pkg-config ]; buildInputs = [ libidn2 libiconv ]; |