New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
jq: 1.5 -> 1.6 (!!!!) #49649
jq: 1.5 -> 1.6 (!!!!) #49649
Conversation
(last release was in 2015! :))
Success on x86_64-linux (full log) Attempted: jq Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: jq Partial log (click to expand)
|
Success on x86_64-darwin (full log) Attempted: jq Partial log (click to expand)
|
fc07d2c
to
3fd0151
Compare
Success on x86_64-linux (full log) Attempted: jq Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: jq Partial log (click to expand)
|
Success on x86_64-darwin (full log) Attempted: jq Partial log (click to expand)
|
In-tree uses of the utility appear to be mostly in update scripts
which IMO are lower priority than build breakage or broken packages :).
…On Fri, 02 Nov 2018 19:01:34 +0000 (UTC), GrahamC of Borg ***@***.***> wrote:
<!--REQUEST_ID=02ff7e47-6802-4120-8e6c-166ab528fd59-->
Success on x86_64-darwin [(full log)](https://logs.nix.ci/?key=nixos/nixpkgs.49649&attempt_id=c5bff602-f2b2-4432-b1e1-71f0a65fea94)
Attempted: jq
<details><summary>Partial log (click to expand)</summary><p>
```
# XFAIL: 0
# FAIL: 0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/private/tmp/nix-build-jq-1.6.drv-0/jq-1.6'
make[3]: Leaving directory '/private/tmp/nix-build-jq-1.6.drv-0/jq-1.6'
make[2]: Leaving directory '/private/tmp/nix-build-jq-1.6.drv-0/jq-1.6'
make[1]: Leaving directory '/private/tmp/nix-build-jq-1.6.drv-0/jq-1.6'
/nix/store/qpi120f4406yjg39k2imd10zjqa3bvdd-jq-1.6-bin
```
</p></details>
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#49649 (comment) part: text/html
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The bin changes should be reverted, the rationale is somewhere in the manual.
}; | ||
|
||
outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; | ||
outputs = [ "out" "doc" "man" "dev" "lib" ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bin
should be the first output, the original was as intended.
|
||
doInstallCheck = true; | ||
installCheckTarget = "check"; | ||
|
||
postInstallCheck = '' | ||
$bin/bin/jq --help >/dev/null | ||
$out/bin/jq --help >/dev/null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As above, this should stay bin
.
sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9"; | ||
}) | ||
] | ||
++ stdenv.lib.optional stdenv.isDarwin ./darwin-strptime-test.patch; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure these patches can just be removed for 1.6?
From the changelog here it sounds like the new version should be backwards compatible with 1.5? |
On Fri, 02 Nov 2018 16:06:57 -0700, Profpatsch ***@***.***> wrote:
Profpatsch requested changes on this pull request.
The bin changes should be reverted, the rationale is somewhere in the manual.
> };
- outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
+ outputs = [ "out" "doc" "man" "dev" "lib" ];
`bin` should be the first output, the original was as intended.
>
doInstallCheck = true;
installCheckTarget = "check";
postInstallCheck = ''
- $bin/bin/jq --help >/dev/null
+ $out/bin/jq --help >/dev/null
As above, this should stay `bin`.
I thought I remembered there being a reason
but didn't think to check the manual, whoops.
Will refresh without these two changes shortly.
>
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;
Are you sure these patches can just be removed for 1.6?
I didn't thoroughly investigate but they both are from upstream
and seem merged (and not reverted) so I'd say it's safe.
The Darwin patch I mention in the PR text, or I meant to :).
…
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#49649 (review) part: text/html
|
Honestly it'd be surprising if it wasn't, but first release in X years
made it seem worth at least discussing. Glad it's compat! :)
…On Fri, 02 Nov 2018 16:08:58 -0700, Profpatsch ***@***.***> wrote:
From the changelog [here](https://github.com/stedolan/jq/releases/tag/jq-1.6) it sounds like the new version should be backwards compatible with 1.5?
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#49649 (comment) part: text/html
|
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.
3fd0151
to
f387d75
Compare
Success on aarch64-linux (full log) Attempted: jq Partial log (click to expand)
|
Success on x86_64-darwin (full log) Attempted: jq Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: jq Partial log (click to expand)
|
Looking good! |
Motivation for this change
WOOOOOOO
Also, no longer requires specifying '.' when using in a chain/piping it!!
Unsure impact on rebuilds, and looks to be used in a few scripts in-tree
which should be checked to work as expected.
But first, let's see what borg says :).
(oh and I checked commit history and there are indeed commits that (claim)
to fix the issue we had the Darwin strptime patch for)
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)