From 45e940777e0b1d599bfed34d1e2024ce13aba521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Nov 2024 07:28:14 +0100
Subject: [PATCH 1/3] nixVersions.nix_2_19: drop

---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix  | 1 -
 pkgs/tools/package-management/nix/default.nix | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
index 3a4050c7065b..f9089715de31 100644
--- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -74,7 +74,6 @@ in stdenv.mkDerivation (finalAttrs: {
     latest = localRepoCheck nixVersions.latest;
     git = localRepoCheck nixVersions.git;
     nix_2_18 = localRepoCheck nixVersions.nix_2_18;
-    nix_2_19 = localRepoCheck nixVersions.nix_2_19;
   };
 
   meta = {
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c4ed58001ecb..cc4750b785ec 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -179,12 +179,6 @@ in lib.makeExtensible (self: ({
     self_attribute_name = "nix_2_18";
   };
 
-  nix_2_19 = common {
-    version = "2.19.7";
-    hash = "sha256-CkT1SNwRYYQdN2X4cTt1WX3YZfKZFWf7O1YTEo1APfc=";
-    self_attribute_name = "nix_2_19";
-  };
-
   nix_2_24 = common {
     version = "2.24.10";
     hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=";

From c2c2ac8d2ae2579abbefd52a748d926442dfbc48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Nov 2024 07:28:55 +0100
Subject: [PATCH 2/3] nix: drop unused fetchpatch

---
 pkgs/tools/package-management/nix/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index cc4750b785ec..a1b4ec7debca 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -6,7 +6,6 @@
 , libgit2
 , callPackage
 , fetchFromGitHub
-, fetchpatch
 , fetchpatch2
 , runCommand
 , buildPackages

From 6077aa2a70551e6c0451c65efe076b80020fd548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 25 Nov 2024 16:28:55 +0100
Subject: [PATCH 3/3] nix-inspect: fix build with nix 2.24

---
 pkgs/by-name/ni/nix-inspect/package.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix
index ec4a9dee34e2..84253e3a4d08 100644
--- a/pkgs/by-name/ni/nix-inspect/package.nix
+++ b/pkgs/by-name/ni/nix-inspect/package.nix
@@ -9,12 +9,13 @@
   meson,
   ninja,
   stdenv,
+  fetchpatch,
 }: let
   src = fetchFromGitHub {
     owner = "bluskript";
     repo = "nix-inspect";
-    rev = "86f636b1e01579b3a63b2c778c21a818b00c3d1e";
-    hash = "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=";
+    rev = "c55921e1d1cf980ff6351273fde6cedd5d8fa320";
+    hash = "sha256-Upz+fnWJjzt5WokjO/iaiPbqiwSrqpWjrpcFOqQ4p0E=";
   };
 
   workerPackage = stdenv.mkDerivation {
@@ -22,14 +23,24 @@
 
     pname = "nix-inspect-worker";
     version = "0.1.2";
-    sourceRoot = "${src.name}/worker";
+    postPatch = ''
+      cd worker
+    '';
 
     nativeBuildInputs = [meson ninja pkg-config];
 
+    # TODO: Remove this patch when this pull request is merged and released: https://github.com/bluskript/nix-inspect/pull/18
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/bluskript/nix-inspect/commit/e1e05883d42ce0c7029a3d69dce14ae9d057aae6.patch";
+        sha256 = "sha256-bHo+sRc9pICK0ccdiWLRNNvr8QjNCrlcwMvmUHznAtg=";
+      })
+    ];
+
     buildInputs = [
       boost
       nlohmann_json
-      nixVersions.nix_2_19.dev
+      nixVersions.nix_2_24.dev
     ];
 
     mesonBuildType = "release";