Merge pull request #162782 from deviant/bump-git-series
This commit is contained in:
commit
247c8a676a
|
@ -1,54 +1,36 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, rustPlatform
|
||||
, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
|
||||
{ lib, rustPlatform, fetchFromGitHub
|
||||
, pkg-config, openssl, zlib, curl, libgit2, libssh2
|
||||
}:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
version = "0.9.1";
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-series";
|
||||
version = "unstable-2019-10-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-series";
|
||||
repo = "git-series";
|
||||
rev = version;
|
||||
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
|
||||
rev = "c570a015e15214be46a7fd06ba08526622738e20";
|
||||
sha256 = "1i0m2b7ma6xvkg95k57gaj1wpc1rfvka6h8jr5hglxmqqbz6cb6w";
|
||||
};
|
||||
|
||||
cargoSha256 = "0870f4rd98fbmyl8524ivfg3xf4qpzb1x68q1idnl47mmf68pyx8";
|
||||
cargoSha256 = "1hmx14z3098c98achgii0jkcm4474iw762rmib77amcsxj73zzdh";
|
||||
|
||||
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";
|
||||
})
|
||||
# Cargo.lock: Update url, which fixes incompatibility with NLL
|
||||
(fetchpatch {
|
||||
url = "https://github.com/edef1c/git-series/commit/27ff2ecf2d615dae1113709eca0e43596de12ac4.patch";
|
||||
sha256 = "1byjbdcx56nd0bbwz078bl340rk334mb34cvaa58h76byvhpkw10";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl zlib curl libgit2 libssh2 ];
|
||||
|
||||
LIBGIT2_SYS_USE_PKG_CONFIG = true;
|
||||
LIBSSH2_SYS_USE_PKG_CONFIG = true;
|
||||
nativeBuildInputs = [ cmake pkg-config perl ];
|
||||
buildInputs = [ openssl zlib curl libgit2 libssh2 ];
|
||||
|
||||
postBuild = ''
|
||||
postInstall = ''
|
||||
install -D "$src/git-series.1" "$out/man/man1/git-series.1"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to help with formatting git patches for review on mailing lists";
|
||||
longDescription = ''
|
||||
git series tracks changes to a patch series over time. git
|
||||
series also tracks a cover letter for the patch series,
|
||||
formats the series for email, and prepares pull requests.
|
||||
git series tracks changes to a patch series over time. git
|
||||
series also tracks a cover letter for the patch series,
|
||||
formats the series for email, and prepares pull requests.
|
||||
'';
|
||||
homepage = "https://github.com/git-series/git-series";
|
||||
|
||||
|
|
Loading…
Reference in a new issue