From d9685eb1a34a299863ceac1cb6f79a03e151268c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 29 Nov 2022 04:20:00 +0000 Subject: [PATCH 1/3] obfs4: 0.0.12 -> 0.0.14 --- pkgs/tools/networking/obfs4/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index af64c8190ebc..3ad712f1774c 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,16 +1,21 @@ -{ lib, fetchgit, buildGoModule }: +{ lib, buildGoModule, fetchFromGitLab }: buildGoModule rec { pname = "obfs4"; - version = "0.0.12"; + version = "0.0.14"; - src = fetchgit { - url = "https://git.torproject.org/pluggable-transports/obfs4.git"; - rev = "a564bc3840bc788605e1a8155f4b95ce0d70c6db"; # not tagged - sha256 = "0hqk540q94sh4wvm31jjcvpdklhf8r35in4yii7xnfn58a7amfkc"; + src = fetchFromGitLab { + domain = "gitlab.torproject.org"; + group = "tpo"; + owner = "anti-censorship/pluggable-transports"; + repo = "obfs4"; + rev = "obfs4proxy-${version}"; + sha256 = "sha256-/d1qub/mhEzzLQFytgAlhz8ukIC9d+GPK2Hfi3NMv+M="; }; - vendorSha256 = "0yjanv5piygffpdfysviijl7cql2k0r05bsxnlj4hbamsriz9xqy"; + vendorHash = "sha256-7NF3yMouhjSM9SBNKHkeWV7qy0XTGnepEX28kBpbgdk="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Circumvents censorship by transforming Tor traffic between clients and bridges"; From 734632e4c122880e7d447436ae550eb6f64cc326 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 29 Nov 2022 04:20:00 +0000 Subject: [PATCH 2/3] obfs4: update meta --- pkgs/tools/networking/obfs4/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 3ad712f1774c..8eb3e8f55d05 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -30,11 +30,10 @@ buildGoModule rec { specification, and its modular architecture allows it to support multiple pluggable transports. ''; - homepage = "https://www.torproject.org/projects/obfsproxy"; + homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4"; maintainers = with maintainers; [ thoughtpolice ]; mainProgram = "obfs4proxy"; - changelog = "https://gitweb.torproject.org/pluggable-transports/obfs4.git/plain/ChangeLog"; - downloadPage = "https://gitweb.torproject.org/pluggable-transports/obfs4.git/"; + changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4/-/raw/${src.rev}/ChangeLog"; license = with lib.licenses; [ bsd2 bsd3 gpl3 ]; }; } From 92e372174cc0109b9987f7a1888245ac6b196102 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 29 Nov 2022 04:20:00 +0000 Subject: [PATCH 3/3] obfs4: install manpage --- pkgs/tools/networking/obfs4/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 8eb3e8f55d05..edaf6d27c8d8 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitLab }: +{ lib, buildGoModule, fetchFromGitLab, installShellFiles }: buildGoModule rec { pname = "obfs4"; @@ -17,6 +17,12 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage doc/obfs4proxy.1 + ''; + meta = with lib; { description = "Circumvents censorship by transforming Tor traffic between clients and bridges"; longDescription = ''