Skip to content
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

Merged
merged 2 commits into from Nov 3, 2018
Merged

jq: 1.5 -> 1.6 (!!!!) #49649

merged 2 commits into from Nov 3, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Nov 2, 2018

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

(last release was in 2015! :))
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: jq

Partial log (click to expand)

# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/build/jq-1.6'
make[3]: Leaving directory '/build/jq-1.6'
make[2]: Leaving directory '/build/jq-1.6'
make[1]: Leaving directory '/build/jq-1.6'
/nix/store/0ryssnf6lql8ir09dr1kz8fiv08shx9f-jq-1.6-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: jq

Partial log (click to expand)

# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/build/jq-1.6'
make[3]: Leaving directory '/build/jq-1.6'
make[2]: Leaving directory '/build/jq-1.6'
make[1]: Leaving directory '/build/jq-1.6'
/nix/store/106vvd5g5i9z0p6h4zfch5qa886657p7-jq-1.6-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: jq

Partial log (click to expand)

# 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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: jq

Partial log (click to expand)

# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/build/jq-1.6'
make[3]: Leaving directory '/build/jq-1.6'
make[2]: Leaving directory '/build/jq-1.6'
make[1]: Leaving directory '/build/jq-1.6'
/nix/store/2ixjip8qlqdkhain2i3yhfqdj9zgk4xl-jq-1.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: jq

Partial log (click to expand)

# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/build/jq-1.6'
make[3]: Leaving directory '/build/jq-1.6'
make[2]: Leaving directory '/build/jq-1.6'
make[1]: Leaving directory '/build/jq-1.6'
/nix/store/00qrmnsr8a2bh9l6w98kd8d3qb0ij4m0-jq-1.6

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: jq

Partial log (click to expand)

# 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/m00iwfbm65abdd9sdf7l0s54dcy5gyax-jq-1.6

@dtzWill
Copy link
Member Author

dtzWill commented Nov 2, 2018 via email

@Profpatsch
Copy link
Member

cc @aszlig @fpletz

Copy link
Member

@Profpatsch Profpatsch left a 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" ];
Copy link
Member

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
Copy link
Member

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;
Copy link
Member

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?

@Profpatsch
Copy link
Member

From the changelog here it sounds like the new version should be backwards compatible with 1.5?

@dtzWill
Copy link
Member Author

dtzWill commented Nov 3, 2018 via email

@dtzWill
Copy link
Member Author

dtzWill commented Nov 3, 2018 via email

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.
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: jq

Partial log (click to expand)

/nix/store/106vvd5g5i9z0p6h4zfch5qa886657p7-jq-1.6-bin

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: jq

Partial log (click to expand)

# 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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: jq

Partial log (click to expand)

# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/build/jq-1.6'
make[3]: Leaving directory '/build/jq-1.6'
make[2]: Leaving directory '/build/jq-1.6'
make[1]: Leaving directory '/build/jq-1.6'
/nix/store/0ryssnf6lql8ir09dr1kz8fiv08shx9f-jq-1.6-bin

@Profpatsch Profpatsch merged commit ffd083e into NixOS:master Nov 3, 2018
@Profpatsch
Copy link
Member

Looking good!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants