From 77539c6dad209e039fef9a00e7dd16610968253f Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 23 Nov 2019 02:14:30 +0000 Subject: [PATCH 1/2] git-series: format parameters as multiple lines --- pkgs/development/tools/git-series/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index d2bc539860b3..c34d7dc9c752 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform +, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 +}: with rustPlatform; From 476d1bec0709db85878a81bc4e5e06e5faf7a354 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 23 Nov 2019 02:16:18 +0000 Subject: [PATCH 2/2] git-series: use nixpkgs libssh2 This replaces the vendored copy from libssh2-sys. --- pkgs/development/tools/git-series/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index c34d7dc9c752..7e126b3d112c 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, rustPlatform -, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 +, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2 }: with rustPlatform; @@ -30,8 +30,9 @@ buildRustPackage rec { ]; LIBGIT2_SYS_USE_PKG_CONFIG = true; + LIBSSH2_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ openssl zlib curl libgit2 ]; + buildInputs = [ openssl zlib curl libgit2 libssh2 ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1"