Commit Graph

19 Commits

Author SHA1 Message Date
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Dylan Simon
7875c34f12 jq: fix download hash 2018-12-02 14:14:39 -05:00
Will Dietz
ffd083ec44 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.
2018-11-03 11:47:35 +01:00
Daiderd Jordan
64e550c31f
jq: disable strptime test on darwin
This seems to fail depending on the machine's configuration, probably
something locale or timezone related.
2018-08-01 20:33:44 +02:00
Daiderd Jordan
aeab0ec63b jq: fix tests on darwin
The tests depend on libjq which isn't installed in the correct location
yet when the checkPhase runs.
2018-07-30 20:45:14 +02:00
Profpatsch
846d8f8305 jq: split outputs and run tests 2018-07-29 15:30:29 +02:00
Domen Kožar
2b70f5e251
jq: sanity check with --help 2017-10-04 12:00:07 +01:00
Daiderd Jordan
2066cb0b02
jq: don't add rpath on darwin 2017-10-03 00:18:30 +02:00
Michael Raskin
15e5c5214c jq: fix autoupdate metadata in case it gets updated in future 2016-09-26 15:49:30 +02:00
Aneesh Agrawal
bfbca9dacd jq: Fix CVE-2015-8863 and CVE-2016-4074 (#18908)
jq has not had a release since v1.5 in August 2015, so backport both of
these patches (the fix for CVE-2015-8863 is in the current master, while
the fix for CVE-2016-4074 is not yet in master).
2016-09-25 15:14:52 +02:00
Ryan Artecona
76e99d76ce jq: build with oniguruma for regex support 2015-11-07 13:54:45 -05:00
Casey Ransom
8b8f87cf21 jq: 1.4 -> 1.5 2015-10-08 17:13:32 -04:00
Francesco Lazzarino
9db29d7e5b jq builds on darwin 2014-10-09 12:00:34 -05:00
Igor Pashev
628ae1c63e jq: make sure libjq is in library search path
Fixes runtime error:

jq: error while loading shared libraries: libjq.so.1:
cannot open shared object file: No such file or directory
2014-08-18 16:22:51 +02:00
Michael Raskin
99d59d8094 Update jq 2014-06-10 09:41:48 +04:00
Michael Raskin
ccc11345c9 Adding jq JSON processor 2013-05-23 14:41:29 +04:00