From 75000c10a64a8cb4d641fd8e3bf4981606ef355e Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sun, 1 Sep 2024 14:39:15 -0400
Subject: [PATCH 1/3] jq: migrate to by-name

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

diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/by-name/jq/jq/package.nix
similarity index 100%
rename from pkgs/development/tools/jq/default.nix
rename to pkgs/by-name/jq/jq/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4374c589db4c..938fe5f6c8d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8936,8 +8936,6 @@ with pkgs;
 
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;
 
-  jq = callPackage ../development/tools/jq { };
-
   jiq = callPackage ../development/tools/misc/jiq { };
 
   jql = callPackage ../development/tools/jql { };

From 75406713eb7daef7f4c9755c24638b7fec7be0a7 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sun, 1 Sep 2024 15:08:48 -0400
Subject: [PATCH 2/3] jq: nuke references from "bin" to "man" and "doc"

---
 pkgs/by-name/jq/jq/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index 1443ca78371a..fa8e561b4856 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -61,10 +61,16 @@ stdenv.mkDerivation rec {
   # jq is linked to libjq:
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
 
-  # Break the dependency cycle: $dev refers to $bin via propagated-build-outputs, and
-  # $bin refers to $dev because of https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100
+  # jq binary includes the whole `configureFlags` in:
+  # https://github.com/jqlang/jq/commit/583e4a27188a2db097dd043dd203b9c106bba100
+  # Strip unnecessary dependencies here to reduce closure size and break the
+  # dependency cycle: $dev also refers to $bin via propagated-build-outputs
   postFixup = ''
-    remove-references-to -t "$dev" "$bin/bin/jq"
+    remove-references-to \
+      -t "$dev" \
+      -t "$man" \
+      -t "$doc" \
+      "$bin/bin/jq"
   '';
 
   doInstallCheck = true;

From 899a790d808e447bdf686009fd16386e21f0beb2 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Sun, 1 Sep 2024 15:10:46 -0400
Subject: [PATCH 3/3] jq: merge output "lib" into "out"

---
 pkgs/by-name/jq/jq/package.nix         | 2 +-
 pkgs/development/r-modules/default.nix | 2 +-
 pkgs/development/tools/zsv/default.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix
index fa8e561b4856..515923f78421 100644
--- a/pkgs/by-name/jq/jq/package.nix
+++ b/pkgs/by-name/jq/jq/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-R4ycoSn9LjRD/icxS0VeIR4NjGC8j/ffcDhz3u7lgMI=";
   };
 
-  outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
+  outputs = [ "bin" "doc" "man" "dev" "out" ];
 
   # https://github.com/jqlang/jq/issues/2871
   postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD ''
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 3ac1f52f2e76..1b3670f22a65 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -645,7 +645,7 @@ let
     SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev];
     specklestar = [ pkgs.fftw.dev ];
     cartogramR = [ pkgs.fftw.dev ];
-    jqr = [ pkgs.jq.lib ];
+    jqr = [ pkgs.jq.out ];
     kza = [ pkgs.pkg-config ];
     igraph = with pkgs; [ gmp libxml2.dev glpk ];
     interpolation = [ pkgs.gmp ];
diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix
index ee24281798d7..0cfc77d01074 100644
--- a/pkgs/development/tools/zsv/default.nix
+++ b/pkgs/development/tools/zsv/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ jq ];
 
   configureFlags = [
-    "--jq-prefix=${jq.lib}"
+    "--jq-prefix=${lib.getLib jq}"
   ];
 
   meta = with lib; {