wget: remove ? null from inputs
This commit is contained in:
parent
0cd4230400
commit
f483774264
|
@ -1,8 +1,9 @@
|
||||||
{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages
|
{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages
|
||||||
, libidn2, zlib, pcre, libuuid, libiconv, libintl
|
, libidn2, zlib, pcre, libuuid, libiconv, libintl
|
||||||
, python3, lzip
|
, python3, lzip
|
||||||
, libpsl ? null
|
, withLibpsl ? false, libpsl
|
||||||
, openssl ? null }:
|
, withOpenssl ? true, openssl
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wget";
|
pname = "wget";
|
||||||
|
@ -31,12 +32,12 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ];
|
nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ];
|
||||||
buildInputs = [ libidn2 zlib pcre libuuid ]
|
buildInputs = [ libidn2 zlib pcre libuuid ]
|
||||||
++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ]
|
++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ]
|
||||||
++ lib.optional (openssl != null) openssl
|
++ lib.optional withOpenssl openssl
|
||||||
++ lib.optional (libpsl != null) libpsl
|
++ lib.optional withLibpsl libpsl
|
||||||
++ lib.optional stdenv.isDarwin perlPackages.perl;
|
++ lib.optional stdenv.isDarwin perlPackages.perl;
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
(lib.withFeatureAs (openssl != null) "ssl" "openssl")
|
(lib.withFeatureAs withOpenssl "ssl" "openssl")
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
# https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
|
# https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
|
||||||
"--without-included-regex"
|
"--without-included-regex"
|
||||||
|
@ -46,18 +47,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
|
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
|
||||||
|
|
||||||
longDescription =
|
longDescription =
|
||||||
'' GNU Wget is a free software package for retrieving files using HTTP,
|
'' GNU Wget is a free software package for retrieving files using HTTP,
|
||||||
HTTPS and FTP, the most widely-used Internet protocols. It is a
|
HTTPS and FTP, the most widely-used Internet protocols. It is a
|
||||||
non-interactive commandline tool, so it may easily be called from
|
non-interactive commandline tool, so it may easily be called from
|
||||||
scripts, cron jobs, terminals without X-Windows support, etc.
|
scripts, cron jobs, terminals without X-Windows support, etc.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
|
|
||||||
homepage = "https://www.gnu.org/software/wget/";
|
homepage = "https://www.gnu.org/software/wget/";
|
||||||
|
|
||||||
maintainers = with maintainers; [ fpletz ];
|
maintainers = with maintainers; [ fpletz ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
|
|
|
@ -12073,9 +12073,7 @@ with pkgs;
|
||||||
|
|
||||||
webalizer = callPackage ../tools/networking/webalizer { };
|
webalizer = callPackage ../tools/networking/webalizer { };
|
||||||
|
|
||||||
wget = callPackage ../tools/networking/wget {
|
wget = callPackage ../tools/networking/wget { };
|
||||||
libpsl = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
wget2 = callPackage ../tools/networking/wget2 {
|
wget2 = callPackage ../tools/networking/wget2 {
|
||||||
# update breaks grub2
|
# update breaks grub2
|
||||||
|
|
Loading…
Reference in a new issue