Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin
treewide: fix buildGoModule packages on darwin
This commit is contained in:
@@ -1,11 +1,8 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoModule }:
|
||||
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
|
||||
|
||||
let version = "1.2.1";
|
||||
in buildGoModule rec {
|
||||
inherit version;
|
||||
buildGoModule rec {
|
||||
pname = "drone-cli";
|
||||
revision = "v${version}";
|
||||
goPackagePath = "github.com/drone/drone-cli";
|
||||
version = "1.2.1";
|
||||
|
||||
modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b";
|
||||
|
||||
@@ -16,10 +13,12 @@ in buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "drone";
|
||||
repo = "drone-cli";
|
||||
rev = revision;
|
||||
rev = "v${version}";
|
||||
sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = with maintainers; [ bricewge ];
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, buildGoModule }:
|
||||
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
|
||||
|
||||
buildGoModule rec {
|
||||
name = "drone.io-${version}";
|
||||
@@ -14,6 +14,8 @@ buildGoModule rec {
|
||||
sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
|
||||
};
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
maintainers = with maintainers; [ elohmeier vdemeester ];
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib, writeText }:
|
||||
{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fly";
|
||||
@@ -20,6 +20,8 @@ buildGoModule rec {
|
||||
-X github.com/concourse/concourse.Version=${version}
|
||||
'';
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
# The fly.bash file included with this derivation can be replaced by a
|
||||
# call to `fly completion bash` once the `completion` subcommand has
|
||||
# made it into a release. Similarly, `fly completion zsh` will provide
|
||||
@@ -28,7 +30,7 @@ buildGoModule rec {
|
||||
install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A command line interface to Concourse CI";
|
||||
homepage = "https://concourse-ci.org";
|
||||
license = licenses.asl20;
|
||||
|
||||
Reference in New Issue
Block a user