Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-01-01 06:22:43 +00:00
committed by GitHub
13 changed files with 259 additions and 84 deletions
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
@@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
# Needed to get openssl-sys to use pkgconfig.
OPENSSL_NO_VENDOR = 1;
meta = with lib; {
description =
"A command-line application for interacting with git repositories";
meta = with stdenv.lib; {
description = "A command-line application for interacting with git repositories";
homepage = "https://github.com/Byron/gitoxide";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = [ maintainers.syberant ];