From 77572763d48fda5f4df71190da5b42e2b5985d86 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Fri, 5 Jun 2026 15:22:39 +0200
Subject: [PATCH 1/2] htgettoken: migrate to pyproject

---
 pkgs/by-name/ht/htgettoken/package.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index 7f94f37d9dc1..4fc0bbd98f1e 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -2,13 +2,12 @@
   lib,
   fetchFromGitHub,
   python3,
-  makeWrapper,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "htgettoken";
   version = "2.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fermitools";
@@ -17,21 +16,15 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     hash = "sha256-jHKKTnFZ+6LHaB61wi5+Ht6ZHrE4dDqADIMfGWI47oM=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
     setuptools
-    makeWrapper
   ];
 
-  postInstall = with python3.pkgs; ''
-    wrapProgram $out/bin/htgettoken \
-      --prefix PYTHONPATH : "${
-        makePythonPath [
-          gssapi
-          paramiko
-          urllib3
-        ]
-      }"
-  '';
+  dependencies = with python3.pkgs; [
+    gssapi
+    paramiko
+    urllib3
+  ];
 
   meta = {
     description = "Gets OIDC authentication tokens for High Throughput Computing via a Hashicorp vault server ";

From f388a973249278f3a92770ba73186df8e31e3fa3 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Fri, 5 Jun 2026 15:33:32 +0200
Subject: [PATCH 2/2] htgettoken: wrap secondary programs

---
 pkgs/by-name/ht/htgettoken/package.nix | 45 ++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/pkgs/by-name/ht/htgettoken/package.nix b/pkgs/by-name/ht/htgettoken/package.nix
index 4fc0bbd98f1e..2827257ff15a 100644
--- a/pkgs/by-name/ht/htgettoken/package.nix
+++ b/pkgs/by-name/ht/htgettoken/package.nix
@@ -1,7 +1,14 @@
 {
   lib,
   fetchFromGitHub,
+  makeBinaryWrapper,
   python3,
+  bash,
+  curl,
+  coreutils,
+  gnused,
+  jq,
+  scitokens-cpp,
 }:
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
@@ -20,12 +27,50 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     setuptools
   ];
 
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ];
+
+  buildInputs = [
+    bash
+    curl
+    coreutils
+    jq
+    scitokens-cpp
+  ];
+
   dependencies = with python3.pkgs; [
     gssapi
     paramiko
     urllib3
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/htdecodetoken \
+        --prefix PATH : ${
+          lib.makeBinPath [
+            coreutils
+            jq
+            scitokens-cpp
+          ]
+        }
+    wrapProgram $out/bin/htdestroytoken \
+        --prefix PATH : $out/bin:${
+          lib.makeBinPath [
+            coreutils
+            curl
+          ]
+        }
+    wrapProgram $out/bin/httokensh \
+        --prefix PATH : $out/bin:${
+          lib.makeBinPath [
+            coreutils
+            gnused
+            jq
+          ]
+        }
+  '';
+
   meta = {
     description = "Gets OIDC authentication tokens for High Throughput Computing via a Hashicorp vault server ";
     license = lib.licenses.bsd3;