From e4145698be6abf5ac2d0c052da54a63ff7c20c4c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 13 Sep 2024 12:35:03 +0200
Subject: [PATCH 1/5] itstool: fix cross

Fixes configure step `error: Python module libxml2 is needed to run this package`,
for e.g. nix build .#pkgsCross.aarch64-multiplatform.itstool.
---
 pkgs/development/tools/misc/itstool/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index c8889d33401b8..b4775160e9716 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, buildPackages
 , python3
 }:
 
@@ -16,15 +17,11 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   nativeBuildInputs = [
-    python3
+    buildPackages.python3
+    buildPackages.python3.pkgs.libxml2
     python3.pkgs.wrapPython
   ];
 
-  buildInputs = [
-    python3
-    python3.pkgs.libxml2
-  ];
-
   pythonPath = [
     python3.pkgs.libxml2
   ];

From b693f1696d462022ce684d66f534e0308aed2e54 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 13 Sep 2024 21:51:37 +0200
Subject: [PATCH 2/5] itstool: add versionCheckHook

---
 pkgs/development/tools/misc/itstool/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index b4775160e9716..5beb81cc28c6c 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , buildPackages
 , python3
+, versionCheckHook
 }:
 
 stdenv.mkDerivation rec {
@@ -30,6 +31,9 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     homepage = "https://itstool.org/";
     description = "XML to PO and back again";

From 881ec08a288be3768f843f8775c14be12879f169 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 13 Sep 2024 21:52:39 +0200
Subject: [PATCH 3/5] itstool: move to by-name

---
 .../misc/itstool/default.nix => by-name/it/itstool/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/misc/itstool/default.nix => by-name/it/itstool/package.nix} (100%)

diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/by-name/it/itstool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/itstool/default.nix
rename to pkgs/by-name/it/itstool/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a90940e270948..84303b22769ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18228,8 +18228,6 @@ with pkgs;
 
   iozone = callPackage ../development/tools/misc/iozone { };
 
-  itstool = callPackage ../development/tools/misc/itstool { };
-
   jacoco = callPackage ../development/tools/analysis/jacoco { };
 
   jake = callPackage ../development/tools/jake { };

From 9b83c793e2074e81343b9f965dd051f4c1a64a44 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 13 Sep 2024 21:53:11 +0200
Subject: [PATCH 4/5] itstool: nixfmt

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

diff --git a/pkgs/by-name/it/itstool/package.nix b/pkgs/by-name/it/itstool/package.nix
index 5beb81cc28c6c..56dd16ca9816a 100644
--- a/pkgs/by-name/it/itstool/package.nix
+++ b/pkgs/by-name/it/itstool/package.nix
@@ -1,9 +1,10 @@
-{ stdenv
-, lib
-, fetchurl
-, buildPackages
-, python3
-, versionCheckHook
+{
+  stdenv,
+  lib,
+  fetchurl,
+  buildPackages,
+  python3,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {

From 6ac6165f2775a10c721fff1bf3f775f6dd4aa0ad Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 15 Sep 2024 23:58:42 +0200
Subject: [PATCH 5/5] itstool: use spliced python3Packages instead of
 python3.pkgs

---
 pkgs/by-name/it/itstool/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/it/itstool/package.nix b/pkgs/by-name/it/itstool/package.nix
index 56dd16ca9816a..ba44b41da0487 100644
--- a/pkgs/by-name/it/itstool/package.nix
+++ b/pkgs/by-name/it/itstool/package.nix
@@ -2,8 +2,7 @@
   stdenv,
   lib,
   fetchurl,
-  buildPackages,
-  python3,
+  python3Packages,
   versionCheckHook,
 }:
 
@@ -19,13 +18,13 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   nativeBuildInputs = [
-    buildPackages.python3
-    buildPackages.python3.pkgs.libxml2
-    python3.pkgs.wrapPython
+    python3Packages.python
+    python3Packages.libxml2
+    python3Packages.wrapPython
   ];
 
   pythonPath = [
-    python3.pkgs.libxml2
+    python3Packages.libxml2
   ];
 
   postFixup = ''