libidn2: init at 0.16

wget now needs libidn2 instead of libidn.

cc #22416

3 files changed, 38 insertions, 2 deletions

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
new file mode 100644
index 00000000000..083b04d4b09
--- /dev/null
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -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 ];
+  };
+}
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 7362403d060..105f0692a4d 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f638c0801f7..d07ca51bb9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };