diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
commit | 6f723b9bad655a64f1234557b5e08b5ce9556228 (patch) | |
tree | 68931ba6b8defdba041734ccc72ac40a0fee5b94 /pkgs/tools/text | |
parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
parent | 7d4f67a23f599d82f26d1ec9b89f82e1cc5f3ba9 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/gnupatch/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 5b61220d50a1f..e4595e64c08ba 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a ./CVE-2018-6951.patch (fetchurl { - url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Allow_input_files_to_be_missing_for_ed-style_patches.patch; + url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1; sha256 = "0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64"; }) (fetchurl { # CVE-2018-1000156 - url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Fix_arbitrary_command_execution_in_ed-style_patches.patch; + url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d; sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg"; }) # https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300 diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 311767a786fc0..4fa90441bdbec 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "11.0.1"; + version = "11.0.2"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "0vak82d4vyw0w8agswbyxa6g3zs2h9mxm2xjw0xs9qccvmi7whbb"; + sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3"; }; - cargoSha256 = "1k1wg27p7w8b3cgygnkr6yhsc4hpnvrpa227s612vy2zfcmgb1kx"; + cargoSha256 = "11477l4l1y55klw5dp2kbsnv989vdz1547ml346hcfbkzv7m450v"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; |