diff options
| author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-12-04 14:14:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 14:14:56 +0100 |
| commit | 74228311e214e1e76d6f954ffedfb0df215888a1 (patch) | |
| tree | 7133dbce8eb29a28ecad46577006b82ef280bb91 /pkgs/tools/networking | |
| parent | 8ae00f66949eb2ddd38be71c365abb3b140c6582 (diff) | |
| parent | 92e372174cc0109b9987f7a1888245ac6b196102 (diff) | |
| download | nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.tar nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.tar.gz nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.tar.bz2 nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.tar.lz nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.tar.xz nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.tar.zst nixpkgs-74228311e214e1e76d6f954ffedfb0df215888a1.zip | |
Merge pull request #203929 from marsam/update-obfs4
obfs4: 0.0.12 -> 0.0.14
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/obfs4/default.nix | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index af64c8190eb..edaf6d27c8d 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,16 +1,27 @@ -{ lib, fetchgit, buildGoModule }: +{ lib, buildGoModule, fetchFromGitLab, installShellFiles }: 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" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage doc/obfs4proxy.1 + ''; meta = with lib; { description = "Circumvents censorship by transforming Tor traffic between clients and bridges"; @@ -25,11 +36,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 ]; }; } |