diff options
author | Will Dietz <github@wdtz.org> | 2018-11-03 05:47:35 -0500 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2018-11-03 11:47:35 +0100 |
commit | ffd083ec44661a263ef5c10760a47a8f92da1991 (patch) | |
tree | 428db8996b107c6c59a90518302876bbba9d708f /pkgs/development/tools/jq | |
parent | 722fcbbb80b2142583e9266efe77992f8e32ac4c (diff) | |
download | nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.tar nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.tar.gz nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.tar.bz2 nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.tar.lz nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.tar.xz nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.tar.zst nixlib-ffd083ec44661a263ef5c10760a47a8f92da1991.zip |
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.
Diffstat (limited to 'pkgs/development/tools/jq')
-rw-r--r-- | pkgs/development/tools/jq/darwin-strptime-test.patch | 16 | ||||
-rw-r--r-- | pkgs/development/tools/jq/default.nix | 20 |
2 files changed, 2 insertions, 34 deletions
diff --git a/pkgs/development/tools/jq/darwin-strptime-test.patch b/pkgs/development/tools/jq/darwin-strptime-test.patch deleted file mode 100644 index 4ea83fc164a3..000000000000 --- a/pkgs/development/tools/jq/darwin-strptime-test.patch +++ /dev/null @@ -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] diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 712ec64bd416..b7b2b5066b9f 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -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" |