Unverified Commit dc2ee8af authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

jq: nuke references from "bin" to "man" and "doc" and remove "lib" output (#338880)

parents 4dd40b15 899a790d

pkgs/development/tools/jq/default.nix→pkgs/by-name/jq/jq/package.nix

+10 −4
Original line number Diff line number Diff line
@@ -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 ''
@@ -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;

pkgs/development/r-modules/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/tools/zsv/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [ jq ];



  configureFlags = [

    "--jq-prefix=${jq.lib}"

    "--jq-prefix=${lib.getLib jq}"

  ];



  meta = with lib; {

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -8896,8 +8896,6 @@ with pkgs; 














  jpylyzer = with python3Packages; toPythonApplication jpylyzer;



























  jq = callPackage ../development/tools/jq { };



























  jiq = callPackage ../development/tools/misc/jiq { };





























  jql = callPackage ../development/tools/jql { };