pyrox.dev
wget2: 1.99.2 -> 2.0.0
+38
-23
pkgs/tools/networking/wget2/default.nix
+38
-23
pkgs/tools/networking/wget2/default.nix
···
6
6
, autoreconfHook
7
7
, flex
8
8
, gnulib
9
-
, lzip
10
9
, pkg-config
11
-
, python3
12
10
, texinfo
13
11
# libraries
14
12
, brotli
···
17
15
, libhsts
18
16
, libidn2
19
17
, libpsl
20
-
, xz
18
+
, lzip
21
19
, nghttp2
22
-
, sslSupport ? true
23
20
, openssl
24
21
, pcre2
22
+
, sslSupport ? true
23
+
, xz
25
24
, zlib
26
25
, zstd
27
26
}:
28
27
29
28
stdenv.mkDerivation rec {
30
29
pname = "wget2";
31
-
version = "1.99.2";
30
+
version = "2.0.0";
31
+
32
+
outputs = [ "out" "lib" "dev" ];
32
33
33
34
src = fetchFromGitLab {
34
35
owner = "gnuwget";
35
36
repo = pname;
36
-
rev = version;
37
-
sha256 = "1gws8y3z8xzi46c48n7jb162mr3ar4c34s7yy8kjcs14yzq951qz";
37
+
rev = "v${version}";
38
+
sha256 = "07zs2x2k62836l0arzc333j96yjpwal1v4mr8j99x6qxgmmssrbj";
38
39
};
39
40
40
41
patches = [
41
42
(fetchpatch {
42
-
name = "fix-autotools-2.70.patch";
43
-
url = "https://gitlab.com/gnuwget/wget2/-/commit/580af869093cfda6bc8a9d5901850354a16b3666.patch";
44
-
sha256 = "1x6wq4wxvvy6174d52qrhxkcgmv366f8smxyki49zb6rs4gqhskd";
43
+
name = "fix-bashism-in-configure-ac.patch";
44
+
url = "https://gitlab.com/gnuwget/wget2/-/commit/da9788f5d62b89ba796393d9bc496b1d8d7a7b30.patch";
45
+
sha256 = "0bn3vkgyknks7jzs5722s2c4qlx7k5lwfiyz204bi42v1m28s1a5";
45
46
})
46
47
(fetchpatch {
47
-
name = "update-potfiles-for-gnulib-2020-11-28.patch";
48
-
url = "https://gitlab.com/gnuwget/wget2/-/commit/368deb9fcca0c281f9c76333607cc878c3945ad0.patch";
49
-
sha256 = "1qsz8hbzbgg14wikxsbjjlq0cp3jw4pajbaz9wdn6ny617hdvi8y";
48
+
name = "fix-double-quotes-in-configure-ac.patch";
49
+
url = "https://gitlab.com/gnuwget/wget2/-/commit/574c8ae08dfd8949da039879d85899123d31ab1d.patch";
50
+
sha256 = "14rfmij5w3bvj0fnkkkrxg0lfw3vgwiyvbkal3nqhgb0mlhlmd47";
50
51
})
51
52
];
52
53
53
54
# wget2_noinstall contains forbidden reference to /build/
54
55
postPatch = ''
55
56
substituteInPlace src/Makefile.am \
56
-
--replace 'bin_PROGRAMS = wget2 wget2_noinstall' 'bin_PROGRAMS = wget2'
57
+
--replace "bin_PROGRAMS = wget2 wget2_noinstall" "bin_PROGRAMS = wget2"
57
58
'';
58
59
59
-
nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ];
60
+
strictDeps = true;
61
+
62
+
nativeBuildInputs = [
63
+
autoreconfHook
64
+
flex
65
+
lzip
66
+
pkg-config
67
+
texinfo
68
+
];
60
69
61
-
buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl xz nghttp2 pcre2 zlib zstd ]
62
-
++ lib.optional sslSupport openssl;
70
+
buildInputs = [
71
+
brotli
72
+
bzip2
73
+
gpgme
74
+
libhsts
75
+
libidn2
76
+
libpsl
77
+
nghttp2
78
+
pcre2
79
+
xz
80
+
zlib
81
+
zstd
82
+
] ++ lib.optional sslSupport openssl;
63
83
64
84
# TODO: include translation files
65
85
autoreconfPhase = ''
···
69
89
cp -r ${gnulib} gnulib
70
90
chmod -R u+w gnulib/{build-aux,lib}
71
91
72
-
# fix bashisms can be removed when https://gitlab.com/gnuwget/wget2/-/commit/c9499dcf2f58983d03e659e2a1a7f21225141edf is in the release
73
-
sed 's|==|=|g' -i configure.ac
74
-
75
92
./bootstrap --no-git --gnulib-srcdir=gnulib --skip-po
76
93
'';
77
94
78
95
configureFlags = [
79
-
"--disable-static"
96
+
(lib.enableFeature false "shared")
80
97
# TODO: https://gitlab.com/gnuwget/wget2/-/issues/537
81
98
(lib.withFeatureAs sslSupport "ssl" "openssl")
82
99
];
83
-
84
-
outputs = [ "out" "lib" "dev" ];
85
100
86
101
meta = with lib; {
87
102
description = "successor of GNU Wget, a file and recursive website downloader.";