From 95c7d8300f327406d72ba68625fb54a4b99f7b84 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sat, 15 Sep 2018 10:38:15 +0200 Subject: [PATCH] click: 0.3.1 -> 0.3.2 patch necessary to fix "error: the lock file needs to be updated but --frozen was passed to prevent this" --- .../networking/cluster/click/default.nix | 11 ++++++----- .../cluster/click/fix_cargo_lock_version.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index 7fd4cd9fa82..2c7a026b277 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -4,17 +4,18 @@ with rustPlatform; buildRustPackage rec { name = "click-${version}"; - version = "0.3.1"; - rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a"; + version = "0.3.2"; src = fetchFromGitHub { + rev = "v${version}"; owner = "databricks"; repo = "click"; - sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi"; - inherit rev; + sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2"; }; - cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj"; + cargoSha256 = "05asqp5312a1g26pvf5hgqhc4kj3iw2hdvml2ycvga33sxb7zm7r"; + + patches = [ ./fix_cargo_lock_version.patch ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch new file mode 100644 index 00000000000..bc4db7ef7c1 --- /dev/null +++ b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ff80350..c86c6fe 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -111,7 +111,7 @@ dependencies = [ + + [[package]] + name = "click" +-version = "0.3.1" ++version = "0.3.2" + dependencies = [ + "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",