diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-04 14:55:19 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-18 12:19:49 -0500 |
commit | 9bd437d4b40dd967f7d45982b60b1949f30c6450 (patch) | |
tree | ba2ed176a5471a99c6986bb27a82788d38fc5bb9 /pkgs/development/libraries/pcre2 | |
parent | 4dff3ee959035fadc77b0c2ac949a006b4249b20 (diff) | |
download | nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.tar nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.tar.gz nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.tar.bz2 nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.tar.lz nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.tar.xz nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.tar.zst nixlib-9bd437d4b40dd967f7d45982b60b1949f30c6450.zip |
fetchpatch: Add support for an arbitrary extra prefix
We still ensure the old and new ones start, respectfully, with `a/` and `b/`. Use with `stripLen` to ensure tha the old `a/` and `/b` are gone if a new prefix is added.
Diffstat (limited to 'pkgs/development/libraries/pcre2')
-rw-r--r-- | pkgs/development/libraries/pcre2/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index dd562d2e0f1c..9603e45a8b44 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -20,21 +20,21 @@ stdenv.mkDerivation rec { url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; stripLen = 2; - addPrefixes = true; + 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; - addPrefixes = true; + 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; - addPrefixes = true; + extraPrefix = ""; }) ]; |