jq: 1.5 -> 1.6

* jq: 1.5 -> 1.6 (!!)

(last release was in 2015! :))

* jq: drop darwin patch, appears resolved by upgrade

commit history isn't that long, and has a few addressing
behavior on osx re:strptime-- and since this patch
doesn't apply it seems likely it's been resolved
but probably can be checked by any interested folks w/darwin.
This commit is contained in:
Will Dietz 2018-11-03 05:47:35 -05:00 committed by Profpatsch
parent 722fcbbb80
commit ffd083ec44
2 changed files with 2 additions and 34 deletions

View File

@ -1,16 +0,0 @@
diff --git a/tests/jq.test b/tests/jq.test
index 4a4018b..f5aa7d5 100644
--- a/src/tests/jq.test
+++ b/src/tests/jq.test
@@ -1144,9 +1144,9 @@ bsearch(4)
[1,2,3]
-4
-[strptime("%Y-%m-%dT%H:%M:%SZ")|(.,mktime)]
+[strptime("%Y-%m-%dT%H:%M:%SZ")|mktime]
"2015-03-05T23:51:47Z"
-[[2015,2,5,23,51,47,4,63],1425599507]
+[1425599507]
strftime("%Y-%m-%dT%H:%M:%SZ")
[2015,2,5,23,51,47,4,63]

View File

@ -2,33 +2,17 @@
stdenv.mkDerivation rec {
name = "jq-${version}";
version="1.5";
version="1.6";
src = fetchurl {
url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz";
sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
sha256="1a76f46a652i2g333kfvrl6mp2w7whf6h1yly519izg4y967h9cn";
};
outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
buildInputs = [ oniguruma ];
patches = [
(fetchpatch {
name = "CVE-2015-8863.patch";
url = https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd.diff;
sha256 = "18bjanzvklfzlzzd690y88725l7iwl4f6wnr429na5pfmircbpvh";
})
(fetchpatch {
name = "CVE-2016-4074.patch";
url = https://patch-diff.githubusercontent.com/raw/stedolan/jq/pull/1214.diff;
sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9";
})
]
++ stdenv.lib.optional stdenv.isDarwin ./darwin-strptime-test.patch;
patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released
configureFlags =
[
"--bindir=\${bin}/bin"