diff options
| author | volth <volth@webmaster.ms> | 2018-07-08 10:48:52 +0000 |
|---|---|---|
| committer | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2018-07-08 10:48:52 +0000 |
| commit | 4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5 (patch) | |
| tree | 6d3f79c907cb281d79445bfa3e8c1b719cf42900 /pkgs/development/libraries/pcre2 | |
| parent | 4dc44955e8922d0ebcc667ea669375d816a839e1 (diff) | |
| download | nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.tar nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.tar.gz nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.tar.bz2 nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.tar.lz nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.tar.xz nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.tar.zst nixpkgs-4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5.zip | |
pcre2: 10.23 -> 10.31 (#43168)
Diffstat (limited to 'pkgs/development/libraries/pcre2')
| -rw-r--r-- | pkgs/development/libraries/pcre2/default.nix | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 2e1ed060aca..73e7fd42cdb 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.23"; + version = "10.31"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz"; + sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; }; configureFlags = [ @@ -14,34 +14,8 @@ stdenv.mkDerivation rec { "--enable-jit" ]; - patches = [ - (fetchpatch { - name = "CVE-2017-7186-part1.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; - sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-7186-part2.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date"; - sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn"; - stripLen = 2; - extraPrefix = ""; - }) - (fetchpatch { - name = "CVE-2017-8786.patch"; - url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2test.c?r1=692&r2=697&view=patch"; - sha256 = "1c629nzrk4il2rfclwyc1a373q58m4q9ys9wr91zhl4skfk7x19b"; - stripLen = 2; - extraPrefix = ""; - }) - ]; - outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; - doCheck = false; # fails 1 of 3 tests - postFixup = '' moveToOutput bin/pcre2-config "$dev" ''; |