Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 722fcbbb80b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffd083ec4466
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 3, 2018

  1. 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.
    @dtzWill @Profpatsch
    dtzWill authored and Profpatsch committed Nov 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ffd083e View commit details
Showing with 2 additions and 34 deletions.
  1. +0 −16 pkgs/development/tools/jq/darwin-strptime-test.patch
  2. +2 −18 pkgs/development/tools/jq/default.nix
16 changes: 0 additions & 16 deletions pkgs/development/tools/jq/darwin-strptime-test.patch
View file

This file was deleted.

20 changes: 2 additions & 18 deletions pkgs/development/tools/jq/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"