Merge pull request #183806 from SuperSandro2000/wget

authored by Sandro and committed by GitHub dcbf8d27 f6d7bf03

+7 -12
+6 -9
pkgs/tools/networking/wget/default.nix
··· 1 { lib, stdenv, fetchurl, gettext, pkg-config, perlPackages 2 , libidn2, zlib, pcre, libuuid, libiconv, libintl 3 , python3, lzip 4 - , libpsl ? null 5 - , openssl ? null }: 6 7 stdenv.mkDerivation rec { 8 pname = "wget"; ··· 31 nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ]; 32 buildInputs = [ libidn2 zlib pcre libuuid ] 33 ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] 34 - ++ lib.optional (openssl != null) openssl 35 - ++ lib.optional (libpsl != null) libpsl 36 ++ lib.optional stdenv.isDarwin perlPackages.perl; 37 38 configureFlags = [ 39 - (lib.withFeatureAs (openssl != null) "ssl" "openssl") 40 ] ++ lib.optionals stdenv.isDarwin [ 41 # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html 42 "--without-included-regex" ··· 46 47 meta = with lib; { 48 description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; 49 - 50 longDescription = 51 '' GNU Wget is a free software package for retrieving files using HTTP, 52 HTTPS and FTP, the most widely-used Internet protocols. It is a 53 non-interactive commandline tool, so it may easily be called from 54 scripts, cron jobs, terminals without X-Windows support, etc. 55 ''; 56 - 57 license = licenses.gpl3Plus; 58 - 59 homepage = "https://www.gnu.org/software/wget/"; 60 - 61 maintainers = with maintainers; [ fpletz ]; 62 platforms = platforms.all; 63 };
··· 1 { lib, stdenv, fetchurl, gettext, pkg-config, perlPackages 2 , libidn2, zlib, pcre, libuuid, libiconv, libintl 3 , python3, lzip 4 + , withLibpsl ? false, libpsl 5 + , withOpenssl ? true, openssl 6 + }: 7 8 stdenv.mkDerivation rec { 9 pname = "wget"; ··· 32 nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ]; 33 buildInputs = [ libidn2 zlib pcre libuuid ] 34 ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] 35 + ++ lib.optional withOpenssl openssl 36 + ++ lib.optional withLibpsl libpsl 37 ++ lib.optional stdenv.isDarwin perlPackages.perl; 38 39 configureFlags = [ 40 + (lib.withFeatureAs withOpenssl "ssl" "openssl") 41 ] ++ lib.optionals stdenv.isDarwin [ 42 # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html 43 "--without-included-regex" ··· 47 48 meta = with lib; { 49 description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; 50 longDescription = 51 '' GNU Wget is a free software package for retrieving files using HTTP, 52 HTTPS and FTP, the most widely-used Internet protocols. It is a 53 non-interactive commandline tool, so it may easily be called from 54 scripts, cron jobs, terminals without X-Windows support, etc. 55 ''; 56 license = licenses.gpl3Plus; 57 homepage = "https://www.gnu.org/software/wget/"; 58 maintainers = with maintainers; [ fpletz ]; 59 platforms = platforms.all; 60 };
+1 -3
pkgs/top-level/all-packages.nix
··· 12077 12078 webalizer = callPackage ../tools/networking/webalizer { }; 12079 12080 - wget = callPackage ../tools/networking/wget { 12081 - libpsl = null; 12082 - }; 12083 12084 wget2 = callPackage ../tools/networking/wget2 { 12085 # update breaks grub2
··· 12077 12078 webalizer = callPackage ../tools/networking/webalizer { }; 12079 12080 + wget = callPackage ../tools/networking/wget { }; 12081 12082 wget2 = callPackage ../tools/networking/wget2 { 12083 # update breaks grub2