From 1b87c9dcd640d19dd0bdc2c16e6e4c7b199c2db6 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Tue, 28 Nov 2023 11:37:45 +0000 Subject: [PATCH] httptunnel: update to latest rev; fix darwin version in nixpkgs is at least older than 2012 https://github.com/larsbrinkhoff/httptunnel/compare/3b2a6f15b252a5dfccc067ebae47b93a9b9f2d14...d8f91af976c97a6006a5bd1ad7149380c39ba454 --- pkgs/tools/networking/httptunnel/default.nix | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index 13ef64175358..c8ff4fa7719d 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.3-unstable-2023-05-08"; pname = "httptunnel"; - src = fetchurl { - url = "http://www.nocrew.org/software/httptunnel/${pname}-${version}.tar.gz"; - sha256 = "0mn5s6p68n32xzadz6ds5i6bp44dyxzkq68r1yljlv470jr84bql"; + src = fetchFromGitHub { + owner = "larsbrinkhoff"; + repo = "httptunnel"; + rev = "d8f91af976c97a6006a5bd1ad7149380c39ba454"; + hash = "sha256-fUaVHE3nxq3fU7DYCvaQTOoMzax/qFH8cMegFLLybNk="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + meta = with lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; - homepage = "http://www.nocrew.org/software/httptunnel"; + homepage = "http://www.gnu.org/software/httptunnel/httptunnel.html"; license = licenses.gpl2; maintainers = with maintainers; [ koral ]; platforms = platforms.unix;