From fd6c3ab7b8260be85d8a6a38fc509d098d1341d4 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 18 Oct 2025 22:24:23 +0000
Subject: [PATCH 1/3] libxls: fix build against gettext >= 0.25

---
 pkgs/by-name/li/libxls/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index ab020551d986..ac0e763e341c 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -17,6 +17,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
+  # workaround required to build against gettext >= 0.25
+  # https://savannah.gnu.org/support/index.php?111272
+  preAutoreconf = ''
+    autopoint --force
+  '';
+
+  # workaround required to build against gettext >= 0.25
+  # https://savannah.gnu.org/support/index.php?111273
+  autoreconfFlags = [
+    "--include=m4"
+    "--install"
+    "--force"
+    "--verbose"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     autoconf-archive

From f12bc4f119999c91aed02fbccd861c24441d28aa Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 18 Oct 2025 22:24:23 +0000
Subject: [PATCH 2/3] libxls: enable checks

---
 pkgs/by-name/li/libxls/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index ac0e763e341c..5a2eeda71610 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
   meta = with lib; {
     description = "Extract Cell Data From Excel xls files";
     homepage = "https://github.com/libxls/libxls";

From ced6225c49d2abe66b550b5e83ebc970b7744d80 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 18 Oct 2025 22:24:23 +0000
Subject: [PATCH 3/3] libxls: modernize

---
 pkgs/by-name/li/libxls/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index 5a2eeda71610..2b05808ea436 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -6,14 +6,14 @@
   autoconf-archive,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxls";
   version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "libxls";
     repo = "libxls";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
@@ -41,12 +41,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Extract Cell Data From Excel xls files";
+    changelog = "https://github.com/libxls/libxls/releases/tag/v${finalAttrs.version}";
     homepage = "https://github.com/libxls/libxls";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     mainProgram = "xls2csv";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})