From 01e0d141f0bb41200e00930768c52e30085b6882 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 10 Mar 2026 11:31:13 +0100
Subject: [PATCH 1/2] influxdb: use structuredAttrs instead of passAsFile

---
 pkgs/by-name/in/influxdb/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/influxdb/package.nix b/pkgs/by-name/in/influxdb/package.nix
index 01ffe864b954..39dc91028bde 100644
--- a/pkgs/by-name/in/influxdb/package.nix
+++ b/pkgs/by-name/in/influxdb/package.nix
@@ -44,16 +44,18 @@ let
       Cflags: -I/out/include
       Libs: -L/out/lib -lflux -lpthread
     '';
-    passAsFile = [ "pkgcfg" ];
     postInstall = ''
       mkdir -p $out/include $out/pkgconfig
       cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+      printf "%s" "$pkgcfg" > $out/pkgconfig/flux.pc
+      substituteInPlace $out/pkgconfig/flux.pc \
         --replace-fail /out $out
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
     '';
+
+    __structuredAttrs = true;
   };
 in
 buildGoModule rec {

From e385893559d097e8a2280a71049c9707ccf22092 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 10 Mar 2026 11:31:34 +0100
Subject: [PATCH 2/2] influxdb: use finalAttrs pattern

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

diff --git a/pkgs/by-name/in/influxdb/package.nix b/pkgs/by-name/in/influxdb/package.nix
index 39dc91028bde..ebc43fc75966 100644
--- a/pkgs/by-name/in/influxdb/package.nix
+++ b/pkgs/by-name/in/influxdb/package.nix
@@ -13,7 +13,7 @@ let
   libflux_version = "0.196.1";
 
   # This is copied from influxdb2 with the required flux version
-  flux = rustPlatform.buildRustPackage rec {
+  flux = rustPlatform.buildRustPackage (finalAttrs: {
     pname = "libflux";
     version = libflux_version;
     src = fetchFromGitHub {
@@ -32,7 +32,7 @@ let
       substituteInPlace flux-core/src/lib.rs \
         --replace-fail "deny(warnings, missing_docs))]" "deny(warnings), allow(dead_code, mismatched_lifetime_syntaxes, unused_assignments))]"
     '';
-    sourceRoot = "${src.name}/libflux";
+    sourceRoot = "${finalAttrs.src.name}/libflux";
 
     cargoHash = "sha256-A6j/lb47Ob+Po8r1yvqBXDVP0Hf7cNz8WFZqiVUJj+Y=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -56,16 +56,16 @@ let
     '';
 
     __structuredAttrs = true;
-  };
+  });
 in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "influxdb";
   version = "1.12.2";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influxdb";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Q05mKmAXxrk7IVNxUD8HHNKnWCxmNCdsr6NK7d7vOHM=";
   };
 
@@ -89,7 +89,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   excludedPackages = "test";
@@ -106,4 +106,4 @@ buildGoModule rec {
       zimbatm
     ];
   };
-}
+})