b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

jq: add configuration option to disable regex support (#117895)

Browse source 
Co-authored-by: Dmitry Bogatov <git#v1@kaction.cc>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Dmitry Bogatov 2021-03-30 21:30:34 -04:00 committed by GitHub
parent 0021760e22
commit e0e9b5e200
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/development/tools/jq/default.nix
View file

@ -1,26 +1,52 @@
{ lib, stdenv, nixosTests, fetchurl, oniguruma }: { lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook
, onigurumaSupport ? true, oniguruma }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jq"; pname = "jq";
version = "1.6"; version = "1.6";
src = fetchurl { src = fetchFromGitHub {
url = owner = "stedolan";
"https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; repo = "jq";
sha256 = "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; rev = "${pname}-${version}";
hash = "sha256-CIE8vumQPGK+TFAncmpBijANpFALLTadOvkob0gVzro";
}; };
patches = [
(fetchpatch {
name = "fix-tests-when-building-without-regex-supports.patch";
url = "https://github.com/stedolan/jq/pull/2292/commits/f6a69a6e52b68a92b816a28eb20719a3d0cb51ae.patch";
sha256 = "pTM5FZ6hFs5Rdx+W2dICSS2lcoLY1Q//Lan3Hu8Gr58=";
})
];
outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
buildInputs = [ oniguruma ]; # Upstream script that writes the version that's eventually compiled
# and printed in `jq --help` relies on a .git directory which our src
# doesn't keep.
preConfigure = ''
echo "#!/bin/sh" > scripts/version
echo "echo ${version}" >> scripts/version
patchShebangs scripts/version
'';
# paranoid mode: make sure we never use vendored version of oniguruma
# Note: it must be run after automake, or automake will complain
preBuild = ''
rm -r ./modules/oniguruma
'';
buildInputs = lib.optionals onigurumaSupport [ oniguruma ];
nativeBuildInputs = [ autoreconfHook ];
configureFlags = [ configureFlags = [
"--bindir=\${bin}/bin" "--bindir=\${bin}/bin"
"--sbindir=\${bin}/bin" "--sbindir=\${bin}/bin"
"--datadir=\${doc}/share" "--datadir=\${doc}/share"
"--mandir=\${man}/share/man" "--mandir=\${man}/share/man"
] ] ++ lib.optional (!onigurumaSupport) "--with-oniguruma=no"
# jq is linked to libjq: # jq is linked to libjq:
++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; ++ lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}";
doInstallCheck = true; doInstallCheck = true;
@ -31,6 +57,8 @@ stdenv.mkDerivation rec {
$bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null $bin/bin/jq -r '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null
''; '';
passthru = { inherit onigurumaSupport; };
meta = with lib; { meta = with lib; {
description = "A lightweight and flexible command-line JSON processor"; description = "A lightweight and flexible command-line JSON processor";
license = licenses.mit; license = licenses.mit;