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