From 8e08e348aae65b19ebf201a3a0269f374ae24691 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 20 Mar 2023 00:04:52 +0100 Subject: [PATCH 1/3] sniproxy: 0.6.0 -> 0.6.1 --- .../applications/networking/sniproxy/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 7c8e3dfd93dc..afcdddd3200d 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -1,26 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }: stdenv.mkDerivation rec { pname = "sniproxy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "dlundquist"; repo = "sniproxy"; rev = version; - sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm"; + sha256 = "sha256-htM9CrzaGnn1dnsWQ+0V6N65Og7rsFob3BlSc4UGfFU="; }; - patches = [ - # Pull upstream fix for -fno-common toolchain support: - # https://github.com/dlundquist/sniproxy/pull/349 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/dlundquist/sniproxy/commit/711dd14affd5d0d918cd5fd245328450e60c7111.patch"; - sha256 = "1vlszib2gzxnkl9zbbrf2jz632j1nhs4aanpw7qqnx826zmli0a6"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gettext libev pcre udns ]; From bab87b45674c11e4094f4b1490bc16326f00bf35 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 20 Mar 2023 00:05:02 +0100 Subject: [PATCH 2/3] sniproxy: add raitobezarius as maintainer --- pkgs/applications/networking/sniproxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index afcdddd3200d..c93ca42db258 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Transparent TLS and HTTP layer 4 proxy with SNI support"; license = licenses.bsd2; - maintainers = [ maintainers.womfoo ]; + maintainers = with maintainers; [ womfoo raitobezarius ]; platforms = platforms.linux; }; From f83d8d46cb19db5eaafe8434411d8d2e54d301c2 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 20 Mar 2023 00:21:53 +0100 Subject: [PATCH 3/3] sniproxy: render homepage visible in the nix expression --- pkgs/applications/networking/sniproxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index c93ca42db258..8d2b619ab718 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libev pcre udns ]; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/dlundquist/sniproxy"; description = "Transparent TLS and HTTP layer 4 proxy with SNI support"; license = licenses.bsd2; maintainers = with maintainers; [ womfoo raitobezarius ];