From 88d4b40bb2ecd3448db3bdd59474a75398a5f622 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 16 Oct 2019 17:19:32 +0000 Subject: git-series: use cargoPatches rather than cargoDepsHook --- pkgs/development/tools/git-series/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 5faceca57166..0f46fb804e66 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,16 +15,12 @@ buildRustPackage rec { cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q"; - cargoDepsHook = '' - ( - cd */ - # see https://github.com/git-series/git-series/pull/56 - patch -p1 < ${fetchpatch { - url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch"; - sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0"; - }} - ) - ''; + cargoPatches = [ + (fetchpatch { + url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch"; + sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0"; + }) + ]; nativeBuildInputs = [ cmake pkgconfig perl ]; buildInputs = [ openssl_1_0_2 zlib ]; -- cgit 1.4.1 From f7de72a5525858e0af3c34272fdbb2055379bb7e Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 16 Oct 2019 17:39:17 +0000 Subject: git-series: upgrade Cargo dependencies to allow using OpenSSL 1.1 --- pkgs/development/tools/git-series/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 0f46fb804e66..7c5b590c52cf 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" -- cgit 1.4.1 From 2bc9e6cb37a898ab90161e1fd8e08db3241140e4 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 16 Oct 2019 17:53:49 +0000 Subject: git-series: use nixpkgs libcurl This replaces the vendored copy from curl-sys. --- pkgs/development/tools/git-series/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 7c5b590c52cf..52969609e36c 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, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl }: with rustPlatform; @@ -28,7 +28,7 @@ buildRustPackage rec { ]; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ openssl zlib ]; + buildInputs = [ openssl zlib curl ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1" -- cgit 1.4.1 From fca52043a53e2b059675ffe190163d9c50cb0008 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 17 Oct 2019 07:08:32 +0000 Subject: git-series: use nixpkgs libgit2 This replaces the vendored copy from libgit2-sys. --- pkgs/development/tools/git-series/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 52969609e36c..09691aecb93d 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, cmake, perl, pkgconfig, zlib, curl }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 }: with rustPlatform; @@ -27,8 +27,9 @@ buildRustPackage rec { }) ]; + LIBGIT2_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ openssl zlib curl ]; + buildInputs = [ openssl zlib curl libgit2 ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1" -- cgit 1.4.1 From 67b8f4e0a76dbc54f5310167d15a8edc8e663ae5 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 17 Oct 2019 17:47:12 +0000 Subject: git-series: add edef as maintainer --- pkgs/development/tools/git-series/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 09691aecb93d..d2bc539860b3 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -45,6 +45,6 @@ buildRustPackage rec { homepage = https://github.com/git-series/git-series; license = licenses.mit; - maintainers = [ maintainers.vmandela ]; + maintainers = with maintainers; [ edef vmandela ]; }; } -- cgit 1.4.1