colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libidn2: init at 0.16

Browse Source 
wget now needs libidn2 instead of libidn.

cc #22416
This commit is contained in:
Franz Pletz 2017-02-06 13:01:55 +01:00
parent f629f4e234
commit 8b9e2010b4
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/development/libraries/libidn2/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ fetchurl, stdenv, libiconv, libunistring }:
stdenv.mkDerivation rec {
name = "libidn2-0.16";
src = fetchurl {
url = "https://alpha.gnu.org/gnu/libidn/${name}.tar.gz";
sha256 = "13v8kh4d5nfkymai88zlw3h7k4x9khrpdpv97waf4ah8ykzrxb9g";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
buildInputs = [ libunistring ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
meta = {
homepage = "https://www.gnu.org/software/libidn/#libidn2";
description = "Free software implementation of IDNA2008 and TR46";
longDescription = ''
Libidn2 is believed to be a complete IDNA2008 and TR46 implementation,
but has yet to be as extensively used as the IDNA2003 Libidn library.
The installed C library libidn2 is dual-licensed under LGPLv3+|GPLv2+,
while the rest of the package is GPLv3+. See the file COPYING for
detailed information.
'';
repositories.git = https://gitlab.com/jas/libidn2;
license = with stdenv.lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ];
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ fpletz ];
};
}

4
pkgs/tools/networking/wget/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, libidn, pkgconfig
{ stdenv, fetchurl, gettext, libidn2, pkgconfig
, perl, perlPackages, LWP, python3
, libiconv, libpsl ? null, openssl ? null }:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ gettext pkgconfig perl ];
buildInputs = [ libidn libiconv libpsl ]
buildInputs = [ libidn2 libiconv libpsl ]
++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (openssl != null) openssl
++ stdenv.lib.optional stdenv.isDarwin perl;

2
pkgs/top-level/all-packages.nix
View File

@ -8295,6 +8295,8 @@ with pkgs;
libidn = callPackage ../development/libraries/libidn { };
libidn2 = callPackage ../development/libraries/libidn2 { };
idnkit = callPackage ../development/libraries/idnkit { };
libiec61883 = callPackage ../development/libraries/libiec61883 { };