public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71334 from edef1c/git-series

Browse Source 
Clean up git-series packaging, use OpenSSL 1.1
This commit is contained in:
worldofpeace 2019-10-18 21:42:22 +00:00 committed by GitHub
commit 020e1b0c8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/tools/git-series/default.nix
View File

@ -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, curl, libgit2 }:
with rustPlatform; with rustPlatform;
@ -13,21 +13,23 @@ buildRustPackage rec {
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
}; };
cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q"; cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y";
cargoDepsHook = '' cargoPatches = [
( (fetchpatch {
cd */ url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
# see https://github.com/git-series/git-series/pull/56 sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
patch -p1 < ${fetchpatch { })
url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch"; # Update Cargo.lock to allow using OpenSSL 1.1
sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0"; (fetchpatch {
}} url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch";
) sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s";
''; })
];
LIBGIT2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ cmake pkgconfig perl ]; nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ openssl_1_0_2 zlib ]; buildInputs = [ openssl zlib curl libgit2 ];
postBuild = '' postBuild = ''
install -D "$src/git-series.1" "$out/man/man1/git-series.1" install -D "$src/git-series.1" "$out/man/man1/git-series.1"
@ -43,6 +45,6 @@ buildRustPackage rec {
homepage = https://github.com/git-series/git-series; homepage = https://github.com/git-series/git-series;
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.vmandela ]; maintainers = with maintainers; [ edef vmandela ];
}; };
} }