obfs4: 0.0.14 -> 0.1.0 (#238430)

Rename repo and meta.mainProgram to lyrebird. Don't rename attribute
name and pname, as this will collide with the Gtk3 program lyrebird:
https://github.com/chxrlt/lyrebird

authored by Doron Behar and committed by GitHub fd6b1b92 303a2b2b

+11 -8
+11 -8
pkgs/tools/networking/obfs4/default.nix
··· 2 3 buildGoModule rec { 4 pname = "obfs4"; 5 - version = "0.0.14"; 6 7 src = fetchFromGitLab { 8 domain = "gitlab.torproject.org"; 9 group = "tpo"; 10 owner = "anti-censorship/pluggable-transports"; 11 - repo = "obfs4"; 12 - rev = "obfs4proxy-${version}"; 13 - sha256 = "sha256-/d1qub/mhEzzLQFytgAlhz8ukIC9d+GPK2Hfi3NMv+M="; 14 }; 15 16 - vendorHash = "sha256-7NF3yMouhjSM9SBNKHkeWV7qy0XTGnepEX28kBpbgdk="; 17 18 ldflags = [ "-s" "-w" ]; 19 ··· 21 22 postInstall = '' 23 installManPage doc/obfs4proxy.1 24 ''; 25 26 meta = with lib; { ··· 36 specification, and its modular architecture allows it to support 37 multiple pluggable transports. 38 ''; 39 - homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4"; 40 maintainers = with maintainers; [ thoughtpolice ]; 41 - mainProgram = "obfs4proxy"; 42 - changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4/-/raw/${src.rev}/ChangeLog"; 43 license = with lib.licenses; [ bsd2 bsd3 gpl3 ]; 44 }; 45 }
··· 2 3 buildGoModule rec { 4 pname = "obfs4"; 5 + version = "0.1.0"; 6 7 src = fetchFromGitLab { 8 domain = "gitlab.torproject.org"; 9 group = "tpo"; 10 owner = "anti-censorship/pluggable-transports"; 11 + # We don't use pname = lyrebird and we use the old obfs4 name as the first 12 + # will collide with lyrebird Gtk3 program. 13 + repo = "lyrebird"; 14 + rev = "lyrebird-${version}"; 15 + hash = "sha256-2qBSmAsaR3hfxuoR5U5UAFQAepUOEUnIGoxc/GZ5LmY="; 16 }; 17 18 + vendorHash = "sha256-O8CsvpwL9cfipl4M0BquSnG9tBrt/+i+i80OYk2mNiI="; 19 20 ldflags = [ "-s" "-w" ]; 21 ··· 23 24 postInstall = '' 25 installManPage doc/obfs4proxy.1 26 + ln -s $out/share/man/man1/{obfs4proxy,lyrebird}.1 27 ''; 28 29 meta = with lib; { ··· 39 specification, and its modular architecture allows it to support 40 multiple pluggable transports. 41 ''; 42 + homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird"; 43 maintainers = with maintainers; [ thoughtpolice ]; 44 + mainProgram = "lyrebird"; 45 + changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/-/raw/${src.rev}/ChangeLog"; 46 license = with lib.licenses; [ bsd2 bsd3 gpl3 ]; 47 }; 48 }