From 723e530faee9313f2a57a94c037b4f4301043ca4 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Sat, 10 Aug 2024 17:14:59 -0500
Subject: [PATCH 1/4] ijq: 1.1.0 -> 1.1.1

Changes: https://github.com/gpanders/ijq/compare/v1.1.0...v1.1.1
---
 pkgs/development/tools/ijq/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix
index bdca841eeccb020..741f8f9f99e8682 100644
--- a/pkgs/development/tools/ijq/default.nix
+++ b/pkgs/development/tools/ijq/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ijq";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromSourcehut {
     owner = "~gpanders";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-KtWJwIofMKW+03DFY4UWf3ni1DKuH289svh8iOPo1so=";
+    sha256 = "sha256-rnSpXMadZW6I+7tIYqr1Cb4z00gdREsqin/r6OXaDMA=";
   };
 
-  vendorHash = "sha256-oMkL4qZUS47h9izDad7Ar0Npd6toIZQuy1YIdEoJ2AM=";
+  vendorHash = "sha256-zRa8MPWFvcoVm+LstbSAl1VY3oWMujZPjWS/ti1VXjE=";
 
   nativeBuildInputs = [ installShellFiles makeWrapper scdoc ];
 

From 4559a4d5510579683c7f1cc8dcf1f30d71746c1d Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Sat, 10 Aug 2024 17:24:23 -0500
Subject: [PATCH 2/4] ijq: add mattpolzin as maintainer

---
 pkgs/development/tools/ijq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix
index 741f8f9f99e8682..6c970736ac848a2 100644
--- a/pkgs/development/tools/ijq/default.nix
+++ b/pkgs/development/tools/ijq/default.nix
@@ -32,6 +32,6 @@ buildGoModule rec {
     mainProgram = "ijq";
     homepage = "https://git.sr.ht/~gpanders/ijq";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ justinas SuperSandro2000 ];
+    maintainers = with maintainers; [ justinas mattpolzin SuperSandro2000 ];
   };
 }

From d413c2bdb588ac265f3f4ad3a15aa7098c868e40 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Sat, 10 Aug 2024 17:26:48 -0500
Subject: [PATCH 3/4] ijq: run nixfmt-rfc-style and modernize

feedback from PR review has been applied in addition to the automated
formatting.
---
 pkgs/development/tools/ijq/default.nix | 32 +++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix
index 6c970736ac848a2..69514ad3c648fde 100644
--- a/pkgs/development/tools/ijq/default.nix
+++ b/pkgs/development/tools/ijq/default.nix
@@ -1,4 +1,12 @@
-{ buildGoModule, fetchFromSourcehut, lib, jq, installShellFiles, makeWrapper, scdoc }:
+{
+  buildGoModule,
+  fetchFromSourcehut,
+  lib,
+  jq,
+  installShellFiles,
+  makeBinaryWrapper,
+  scdoc,
+}:
 
 buildGoModule rec {
   pname = "ijq";
@@ -6,16 +14,24 @@ buildGoModule rec {
 
   src = fetchFromSourcehut {
     owner = "~gpanders";
-    repo = pname;
+    repo = "ijq";
     rev = "v${version}";
-    sha256 = "sha256-rnSpXMadZW6I+7tIYqr1Cb4z00gdREsqin/r6OXaDMA=";
+    hash = "sha256-rnSpXMadZW6I+7tIYqr1Cb4z00gdREsqin/r6OXaDMA=";
   };
 
   vendorHash = "sha256-zRa8MPWFvcoVm+LstbSAl1VY3oWMujZPjWS/ti1VXjE=";
 
-  nativeBuildInputs = [ installShellFiles makeWrapper scdoc ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeBinaryWrapper
+    scdoc
+  ];
 
-  ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${version}"
+  ];
 
   postBuild = ''
     scdoc < ijq.1.scd > ijq.1
@@ -32,6 +48,10 @@ buildGoModule rec {
     mainProgram = "ijq";
     homepage = "https://git.sr.ht/~gpanders/ijq";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ justinas mattpolzin SuperSandro2000 ];
+    maintainers = with maintainers; [
+      justinas
+      mattpolzin
+      SuperSandro2000
+    ];
   };
 }

From 8fa374304f55593f82f37ccd86dffc732ef782f8 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Sat, 10 Aug 2024 17:28:36 -0500
Subject: [PATCH 4/4] ijq: move to pkgs/by-name

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

diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/by-name/ij/ijq/package.nix
similarity index 100%
rename from pkgs/development/tools/ijq/default.nix
rename to pkgs/by-name/ij/ijq/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f22aaf47e6fcc2..e7f422ecc77ac2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8932,8 +8932,6 @@ with pkgs;
     packages = config.ihaskell.packages or (_: []);
   };
 
-  ijq = callPackage ../development/tools/ijq { };
-
   iruby = callPackage ../applications/editors/jupyter-kernels/iruby { };
 
   ike-scan = callPackage ../tools/security/ike-scan { };