From 936c4fd68a41778487bd26cfebcc5037720e9d58 Mon Sep 17 00:00:00 2001 From: edef Date: Mon, 6 Jan 2020 21:40:42 +0000 Subject: [PATCH] git-series: update the `url` crate for compiler compatibility Link: https://github.com/git-series/git-series/commit/05262a9e67405947c931dda83e5dc48ffea81b55 --- pkgs/development/tools/git-series/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 7e126b3d112c..0a7c9e7ebe13 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y"; + cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv"; cargoPatches = [ (fetchpatch { @@ -27,6 +27,11 @@ buildRustPackage rec { url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch"; sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s"; }) + # Cargo.lock: Update url, which fixes incompatibility with NLL + (fetchpatch { + url = "https://github.com/edef1c/git-series/commit/27ff2ecf2d615dae1113709eca0e43596de12ac4.patch"; + sha256 = "1byjbdcx56nd0bbwz078bl340rk334mb34cvaa58h76byvhpkw10"; + }) ]; LIBGIT2_SYS_USE_PKG_CONFIG = true;