summary refs log tree commit diff
path: root/pkgs/development/tools/git-series
diff options
context:
space:
mode:
authoredef <edef@edef.eu>2019-10-16 17:39:17 +0000
committeredef <edef@edef.eu>2019-10-18 21:28:46 +0000
commitf7de72a5525858e0af3c34272fdbb2055379bb7e (patch)
treec5882c974002f7c06e140e73ec6d49965f136435 /pkgs/development/tools/git-series
parent88d4b40bb2ecd3448db3bdd59474a75398a5f622 (diff)
downloadnixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.tar
nixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.tar.gz
nixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.tar.bz2
nixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.tar.lz
nixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.tar.xz
nixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.tar.zst
nixpkgs-f7de72a5525858e0af3c34272fdbb2055379bb7e.zip
git-series: upgrade Cargo dependencies to allow using OpenSSL 1.1
Diffstat (limited to 'pkgs/development/tools/git-series')
-rw-r--r--pkgs/development/tools/git-series/default.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 0f46fb804e6..7c5b590c52c 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl_1_0_2, cmake, perl, pkgconfig, zlib }:
+{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }:
 
 with rustPlatform;
 
@@ -13,17 +13,22 @@ buildRustPackage rec {
     sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
   };
 
-  cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q";
+  cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y";
 
   cargoPatches = [
     (fetchpatch {
       url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
       sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
     })
+    # Update Cargo.lock to allow using OpenSSL 1.1
+    (fetchpatch {
+      url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch";
+      sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s";
+    })
   ];
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ openssl_1_0_2 zlib ];
+  buildInputs = [ openssl zlib ];
 
   postBuild = ''
     install -D "$src/git-series.1" "$out/man/man1/git-series.1"