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
This commit is contained in:
Doron Behar 2023-06-20 19:22:38 +00:00 committed by GitHub
parent 303a2b2bb0
commit fd6b1b92bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,18 +2,20 @@
buildGoModule rec {
pname = "obfs4";
version = "0.0.14";
version = "0.1.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
group = "tpo";
owner = "anti-censorship/pluggable-transports";
repo = "obfs4";
rev = "obfs4proxy-${version}";
sha256 = "sha256-/d1qub/mhEzzLQFytgAlhz8ukIC9d+GPK2Hfi3NMv+M=";
# We don't use pname = lyrebird and we use the old obfs4 name as the first
# will collide with lyrebird Gtk3 program.
repo = "lyrebird";
rev = "lyrebird-${version}";
hash = "sha256-2qBSmAsaR3hfxuoR5U5UAFQAepUOEUnIGoxc/GZ5LmY=";
};
vendorHash = "sha256-7NF3yMouhjSM9SBNKHkeWV7qy0XTGnepEX28kBpbgdk=";
vendorHash = "sha256-O8CsvpwL9cfipl4M0BquSnG9tBrt/+i+i80OYk2mNiI=";
ldflags = [ "-s" "-w" ];
@ -21,6 +23,7 @@ buildGoModule rec {
postInstall = ''
installManPage doc/obfs4proxy.1
ln -s $out/share/man/man1/{obfs4proxy,lyrebird}.1
'';
meta = with lib; {
@ -36,10 +39,10 @@ buildGoModule rec {
specification, and its modular architecture allows it to support
multiple pluggable transports.
'';
homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4";
homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird";
maintainers = with maintainers; [ thoughtpolice ];
mainProgram = "obfs4proxy";
changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs4/-/raw/${src.rev}/ChangeLog";
mainProgram = "lyrebird";
changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/-/raw/${src.rev}/ChangeLog";
license = with lib.licenses; [ bsd2 bsd3 gpl3 ];
};
}