From 4b9f32420134d534c6a4f547e0e6f49ec133a2d9 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 22 Feb 2025 22:15:18 +0800 Subject: [PATCH 1/2] idnkit: fix build on gcc-14 --- pkgs/by-name/id/idnkit/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/id/idnkit/package.nix b/pkgs/by-name/id/idnkit/package.nix index d8fcc48acc6a..7f8cae4f4e8e 100644 --- a/pkgs/by-name/id/idnkit/package.nix +++ b/pkgs/by-name/id/idnkit/package.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; + # Ignore errors since gcc-14. + # localconverter.c:602:21/607:26/633:26: error: passing argument 2 of 'iconv' from incompatible pointer type + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + meta = with lib; { homepage = "https://jprs.co.jp/idn/index-e.html"; description = "Provides functionalities about i18n domain name processing"; From 58a975e193308aaad1fd13aff1ac7fc973f73885 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 22 Feb 2025 22:40:11 +0800 Subject: [PATCH 2/2] idnkit: modernize --- pkgs/by-name/id/idnkit/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/id/idnkit/package.nix b/pkgs/by-name/id/idnkit/package.nix index 7f8cae4f4e8e..9f118fad71bb 100644 --- a/pkgs/by-name/id/idnkit/package.nix +++ b/pkgs/by-name/id/idnkit/package.nix @@ -5,13 +5,13 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "idnkit"; version = "2.3"; src = fetchurl { - url = "https://jprs.co.jp/idn/${pname}-${version}.tar.bz2"; - sha256 = "0zp9yc84ff5s0g2i6v9yfyza2n2x4xh0kq7hjd3anhh0clbp3l16"; + url = "https://jprs.co.jp/idn/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-JtBxF2UAQqtGk/DgCWAnXVihvnc+bRPFA7o4RxDz6X4="; }; buildInputs = [ libiconv ]; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { # localconverter.c:602:21/607:26/633:26: error: passing argument 2 of 'iconv' from incompatible pointer type env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - meta = with lib; { + meta = { homepage = "https://jprs.co.jp/idn/index-e.html"; description = "Provides functionalities about i18n domain name processing"; license = { fullName = "Open Source Code License version 1.1"; url = "https://jprs.co.jp/idn/idnkit2-OSCL.txt"; }; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +})