ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"

Browse Source 
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
This commit is contained in:
Jörg Thalheim 2020-03-27 07:33:21 +00:00
parent 0bba7474b3
commit 066db11215
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
133 changed files with 443 additions and 861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/go-ethereum.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }:
{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
buildGoModule rec {
pname = "go-ethereum";
@ -30,8 +30,6 @@ buildGoModule rec {
"cmd/wnode"
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs =
stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];

8
pkgs/applications/blockchains/lnd.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "lnd";
@ -13,12 +13,10 @@ buildGoModule rec {
modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Lightning Network Daemon";
homepage = "https://github.com/lightningnetwork/lnd";
license = licenses.mit;
license = lib.licenses.mit;
maintainers = with maintainers; [ cypherpunk2140 ];
};
}

6
pkgs/applications/editors/glow/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "glow";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Render markdown on the CLI";
homepage = "https://github.com/charmbracelet/glow";
license = licenses.mit;

7
pkgs/applications/misc/archiver/default.nix
View File

@ -1,7 +1,6 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
, Security
, lib
}:
buildGoModule rec {
@ -17,9 +16,7 @@ buildGoModule rec {
modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Easily create & extract archives, and compress & decompress files of various formats";
homepage = "https://github.com/mholt/archiver";
license = licenses.mit;

4
pkgs/applications/misc/exercism/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "exercism";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "./exercism" ];
meta = with stdenv.lib; {

4
pkgs/applications/misc/geoipupdate/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "geoipupdate";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Automatic GeoIP database updater";
homepage = "https://github.com/maxmind/geoipupdate";

6
pkgs/applications/misc/hugo/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "hugo";
version = "0.68.3";
goPackagePath = "github.com/gohugoio/hugo";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
@ -13,8 +15,6 @@ buildGoModule rec {
modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlags = [ "-tags" "extended" ];
subPackages = [ "." ];

10
pkgs/applications/misc/todoist/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "todoist";
@ -13,12 +13,10 @@ buildGoModule rec {
modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = {
homepage = https://github.com/sachaos/todoist;
description = "Todoist CLI Client";
license = licenses.mit;
platforms = platforms.unix;
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
}

7
pkgs/applications/misc/wtf/default.nix
View File

@ -1,9 +1,8 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
, lib
, makeWrapper
, ncurses
, Security
}:
buildGoModule rec {
@ -25,14 +24,12 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = ''
mv "$out/bin/wtf" "$out/bin/wtfutil"
wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "The personal information dashboard for your terminal";
homepage = "https://wtfutil.com/";
license = licenses.mpl20;

6
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }:
{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }:
let
# Argo can package a static server in the CLI using the `staticfiles` go module.
@ -32,8 +32,6 @@ buildGoModule rec {
subPackages = [ "cmd/argo" ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
preBuild = ''
mkdir -p ui/dist/app
echo "Built without static files" > ui/dist/app/index.html
@ -41,7 +39,7 @@ buildGoModule rec {
${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Container native workflow engine for Kubernetes";
homepage = https://github.com/argoproj/argo;
license = licenses.asl20;

6
pkgs/applications/networking/cluster/argocd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, packr, Security }:
{ lib, buildGoModule, fetchFromGitHub, packr }:
buildGoModule rec {
pname = "argocd";
@ -16,8 +16,6 @@ buildGoModule rec {
nativeBuildInputs = [ packr ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
patches = [ ./use-go-module.patch ];
buildFlagsArray = ''
@ -33,7 +31,7 @@ buildGoModule rec {
packr
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes";
homepage = "https://github.com/argoproj/argo";
license = licenses.asl20;

4
pkgs/applications/networking/cluster/atlantis/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "atlantis";
@ -15,8 +15,6 @@ buildGoModule rec {
subPackages = [ "." ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
homepage = "https://github.com/runatlantis/atlantis";
description = "Terraform Pull Request Automation";

4
pkgs/applications/networking/cluster/fluxctl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "fluxctl";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cmd/fluxctl" ];
meta = with stdenv.lib; {

5
pkgs/applications/networking/cluster/helm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }:
{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "helm";
@ -16,9 +16,6 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = ''
$out/bin/helm completion bash > helm.bash
$out/bin/helm completion zsh > helm.zsh

22
pkgs/applications/networking/cluster/helmfile/default.nix
View File

@ -1,8 +1,10 @@
{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
buildGoModule rec {
let version = "0.102.0"; in
buildGoModule {
pname = "helmfile";
version = "0.102.0";
inherit version;
src = fetchFromGitHub {
owner = "roboll";
@ -11,12 +13,12 @@ buildGoModule rec {
sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy";
};
goPackagePath = "github.com/roboll/helmfile";
modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq";
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X main.Version=${version}
@ -24,14 +26,14 @@ buildGoModule rec {
postInstall = ''
wrapProgram $out/bin/helmfile \
--prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]}
--prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
'';
meta = with stdenv.lib; {
meta = {
description = "Deploy Kubernetes Helm charts";
homepage = "https://github.com/roboll/helmfile";
license = licenses.mit;
maintainers = with maintainers; [ pneumaticat yurrriq ];
platforms = platforms.unix;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
platforms = lib.platforms.unix;
};
}

12
pkgs/applications/networking/cluster/hetzner-kube/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "hetzner-kube";
@ -13,18 +13,16 @@ buildGoModule rec {
modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X github.com/xetys/hetzner-kube/cmd.version=${version}
'';
meta = with stdenv.lib; {
meta = {
description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
homepage = "https://github.com/xetys/hetzner-kube";
license = licenses.asl20;
maintainers = with maintainers; [ eliasp ];
platforms = platforms.unix;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ eliasp ];
platforms = lib.platforms.unix;
};
}

6
pkgs/applications/networking/cluster/jx/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
name = "jx";
@ -16,8 +16,6 @@ buildGoModule rec {
./3321-fix-location-of-thrift.patch
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac";
subPackages = [ "cmd/jx" ];
@ -28,7 +26,7 @@ buildGoModule rec {
-X github.com/jenkins-x/jx/pkg/version.Revision=${version}
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "JX is a command line tool for installing and using Jenkins X.";
homepage = https://jenkins-x.io;
longDescription = ''

4
pkgs/applications/networking/cluster/k9s/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "k9s";
@ -22,8 +22,6 @@ buildGoModule rec {
modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style.";
homepage = "https://github.com/derailed/k9s";

6
pkgs/applications/networking/cluster/kubeseal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubeseal";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cmd/kubeseal" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A Kubernetes controller and tool for one-way encrypted Secrets";
homepage = "https://github.com/bitnami-labs/sealed-secrets";
license = licenses.asl20;

6
pkgs/applications/networking/cluster/kubeval/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
buildGoModule rec {
pname = "kubeval";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Validate your Kubernetes configuration files";
homepage = https://github.com/instrumenta/kubeval;
license = licenses.asl20;

4
pkgs/applications/networking/cluster/linkerd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule {
pname = "linkerd-unstablle";
@ -13,8 +13,6 @@ buildGoModule {
modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cli/cmd" ];
meta = with stdenv.lib; {

6
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -6,10 +6,6 @@
, go-bindata
, libvirt
, vmnet
, xpc
, libobjc
, Foundation
, IOKit
}:
buildGoModule rec {
@ -31,7 +27,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ]
++ stdenv.lib.optionals stdenv.isDarwin [ vmnet xpc libobjc IOKit Foundation ];
++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ];
preBuild = ''
go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...

6
pkgs/applications/networking/cluster/prow/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "prow-unstable";
@ -20,8 +20,6 @@ buildGoModule rec {
modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [
"./prow/cmd/admission"
"./prow/cmd/artifact-uploader"
@ -56,7 +54,7 @@ buildGoModule rec {
"./prow/cmd/tot"
];
meta = with stdenv.lib; {
meta = with lib; {
description = "Prow is a Kubernetes based CI/CD system";
longDescription = ''
Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various

6
pkgs/applications/networking/cluster/qbec/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "qbec";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
homepage = "https://github.com/splunk/qbec";
license = licenses.asl20;

5
pkgs/applications/networking/cluster/terraform-providers/default.nix
View File

@ -2,7 +2,6 @@
, buildGoPackage
, fetchFromGitHub
, callPackage
, Security
}:
let
list = import ./data.nix;
@ -24,9 +23,7 @@ let
};
in
{
elasticsearch = callPackage ./elasticsearch {
inherit Security;
};
elasticsearch = callPackage ./elasticsearch {};
gandi = callPackage ./gandi {};
ibm = callPackage ./ibm {};
libvirt = callPackage ./libvirt {};

4
pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "terraform-provider-elasticsearch";
version = "0.7.0";
@ -12,8 +12,6 @@ buildGoModule rec {
modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "." ];
# Terraform allow checking the provider versions, but this breaks

6
pkgs/applications/networking/hydroxide/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
pname = "hydroxide";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
# FIXME: remove with next release
patches = [
(fetchpatch {
@ -25,7 +23,7 @@ buildGoModule rec {
subPackages = [ "cmd/hydroxide" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A third-party, open-source ProtonMail bridge";
homepage = "https://github.com/emersion/hydroxide";
license = licenses.mit;

4
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "gomuks";
@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
homepage = "https://maunium.net/go/gomuks/";
description = "A terminal based Matrix client written in Go";

5
pkgs/applications/networking/ipfs-cluster/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }:
buildGoModule rec {
pname = "ipfs-cluster";
@ -14,8 +14,6 @@ buildGoModule rec {
sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
homepage = https://cluster.ipfs.io/;
@ -24,3 +22,4 @@ buildGoModule rec {
maintainers = with maintainers; [ jglukasik ];
};
}

4
pkgs/applications/networking/ipfs/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ipfs";
@ -18,8 +18,6 @@ buildGoModule rec {
modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A global, versioned, peer-to-peer filesystem";
homepage = https://ipfs.io/;

5
pkgs/applications/networking/mailreaders/aerc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchurl
, go, ncurses, notmuch, scdoc
, python3, perl, w3m, dante, Security
, python3, perl, w3m, dante
}:
let
@ -29,8 +29,7 @@ in buildGoModule rec {
python3.pkgs.colorama
];
buildInputs = [ python3 notmuch ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ python3 notmuch ];
GOFLAGS="-tags=notmuch";

4
pkgs/applications/networking/syncthing/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, libobjc, CoreServices, Foundation }:
{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }:
let
common = { stname, target, postInstall ? "" }:
@ -15,8 +15,6 @@ let
modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc CoreServices Foundation ];
patches = [
./add-stcli-target.patch
];

6
pkgs/applications/networking/websocketd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "websocketd";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
homepage = "http://websocketd.com/";
maintainers = [ maintainers.bjornfor ];

20
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -34,9 +34,7 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
};
ghq = callPackage ./ghq {
inherit (darwin.apple_sdk.frameworks) Security;
};
ghq = callPackage ./ghq { };
git = appendToName "minimal" gitBase;
@ -67,9 +65,7 @@ let
git-appraise = callPackage ./git-appraise {};
git-bug = callPackage ./git-bug {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-bug = callPackage ./git-bug { };
# support for bugzilla
git-bz = callPackage ./git-bz { };
@ -140,9 +136,7 @@ let
git-subrepo = callPackage ./git-subrepo { };
git-subtrac = callPackage ./git-subtrac {
inherit (darwin.apple_sdk.frameworks) Security;
};
git-subtrac = callPackage ./git-subtrac { };
git-sync = callPackage ./git-sync { };
@ -183,13 +177,9 @@ let
inherit (darwin) Security;
};
lab = callPackage ./lab {
inherit (darwin.apple_sdk.frameworks) Security;
};
lab = callPackage ./lab { };
lefthook = callPackage ./lefthook {
inherit (darwin.apple_sdk.frameworks) Security;
};
lefthook = callPackage ./lefthook { };
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };

4
pkgs/applications/version-management/git-and-tools/ghq/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "ghq";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}

4
pkgs/applications/version-management/git-and-tools/git-bug/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "git-bug";
@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/commands.GitCommit=${rev}

6
pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "git-subtrac";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Keep the content for your git submodules all in one place: the parent repo";
homepage = "https://github.com/apenwarr/git-subtrac";
license = licenses.asl20;

4
pkgs/applications/version-management/git-and-tools/lab/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lab";
@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = ''

4
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lefthook";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Fast and powerful Git hooks manager for any type of projects";
homepage = "https://github.com/Arkweid/lefthook";

4
pkgs/development/interpreters/joker/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "joker";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
preBuild = ''
go generate ./...
'';

7
pkgs/development/libraries/packr/default.nix
View File

@ -1,7 +1,6 @@
{ buildGoModule
, fetchFromGitHub
, stdenv
, Security
, lib
}:
buildGoModule rec {
@ -17,11 +16,9 @@ buildGoModule rec {
subPackages = [ "packr" "v2/packr2" ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv";
meta = with stdenv.lib; {
meta = with lib; {
description = "The simple and easy way to embed static files into Go binaries";
homepage = "https://github.com/gobuffalo/packr";
license = licenses.mit;

6
pkgs/development/tools/analysis/tflint/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "tflint";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "14vgy5lavyp4w16g7wpi9xbni3js541rc3w9qn5ab3khqw5rdhgn";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "." ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Terraform linter focused on possible errors, best practices, and so on";
homepage = "https://github.com/terraform-linters/tflint";
changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}";

4
pkgs/development/tools/azcopy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "azure-storage-azcopy";
@ -11,8 +11,6 @@ buildGoModule rec {
sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "." ];
modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb";

4
pkgs/development/tools/bazelisk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "bazelisk";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A user-friendly launcher for Bazel";
longDescription = ''

6
pkgs/development/tools/conftest/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "conftest";
@ -13,14 +13,12 @@ buildGoModule rec {
modSha256 = "0gm08lrlaxc7504mapjdm3c4mwlzybnqxfwkkh6fawzvmd9sqddr";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = ''
-ldflags=
-X main.version=${version}
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Write tests against structured configuration data";
homepage = "https://github.com/instrumenta/conftest";
license = licenses.asl20;

13
pkgs/development/tools/continuous-integration/drone-cli/default.nix
View File

@ -1,8 +1,11 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
let version = "1.2.1";
in buildGoModule rec {
inherit version;
pname = "drone-cli";
version = "1.2.1";
revision = "v${version}";
goPackagePath = "github.com/drone/drone-cli";
modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b";
@ -13,12 +16,10 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "drone";
repo = "drone-cli";
rev = "v${version}";
rev = revision;
sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
maintainers = with maintainers; [ bricewge ];
license = licenses.asl20;

4
pkgs/development/tools/continuous-integration/drone/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
name = "drone.io-${version}";
@ -14,8 +14,6 @@ buildGoModule rec {
sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
maintainers = with maintainers; [ elohmeier vdemeester ];
license = licenses.asl20;

6
pkgs/development/tools/continuous-integration/fly/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }:
{ buildGoModule, fetchFromGitHub, lib, writeText }:
buildGoModule rec {
pname = "fly";
@ -20,8 +20,6 @@ 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
@ -30,7 +28,7 @@ buildGoModule rec {
install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A command line interface to Concourse CI";
homepage = "https://concourse-ci.org";
license = licenses.asl20;

4
pkgs/development/tools/cue/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchgit, stdenv, Security }:
{ buildGoModule, fetchgit, stdenv }:
buildGoModule rec {
pname = "cue";
@ -12,8 +12,6 @@ buildGoModule rec {
modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cmd/cue" ];
buildFlagsArray = [

4
pkgs/development/tools/database/dbmate/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dbmate";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Database migration tool";
homepage = https://github.com/amacneil/dbmate;

84
pkgs/development/tools/database/dbmate/deps.nix generated Normal file
View File

@ -0,0 +1,84 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
goPackagePath = "github.com/go-sql-driver/mysql";
fetch = {
type = "git";
url = "https://github.com/go-sql-driver/mysql";
rev = "2cc627ac8defc45d65066ae98f898166f580f9a4";
sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww";
};
}
{
goPackagePath = "github.com/joho/godotenv";
fetch = {
type = "git";
url = "https://github.com/joho/godotenv";
rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b";
sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
};
}
{
goPackagePath = "github.com/lib/pq";
fetch = {
type = "git";
url = "https://github.com/lib/pq";
rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514";
sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz";
};
}
{
goPackagePath = "github.com/mattn/go-sqlite3";
fetch = {
type = "git";
url = "https://github.com/mattn/go-sqlite3";
rev = "6c771bb9887719704b210e87e934f08be014bdb1";
sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c";
sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl";
};
}
{
goPackagePath = "github.com/urfave/cli";
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a";
sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
};
}
]

5
pkgs/development/tools/dive/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }:
{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
buildGoModule rec {
pname = "dive";
@ -15,8 +15,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];

7
pkgs/development/tools/go-tools/default.nix
View File

@ -1,7 +1,6 @@
{ buildGoModule
, stdenv
, lib
, fetchFromGitHub
, Security
}:
buildGoModule rec {
@ -17,11 +16,9 @@ buildGoModule rec {
sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p";
meta = with stdenv.lib; {
meta = with lib; {
description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
homepage = https://staticcheck.io;
license = licenses.mit;

6
pkgs/development/tools/golangci-lint/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "golangci-lint";
@ -14,9 +14,7 @@ buildGoModule rec {
modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk";
subPackages = [ "cmd/golangci-lint" ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
homepage = "https://golangci.com/";
license = licenses.agpl3;

4
pkgs/development/tools/hcloud/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "hcloud";
@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
postInstall = ''

4
pkgs/development/tools/kcli/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kcli";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "." ];
meta = with stdenv.lib; {

4
pkgs/development/tools/kubeprompt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubeprompt";
@ -21,8 +21,6 @@ buildGoModule rec {
goPackagePath = "github.com/jlesquembre/kubeprompt";
modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Kubernetes prompt";
homepage = "https://github.com/jlesquembre/kubeprompt";

6
pkgs/development/tools/kustomize/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub, tree }:
buildGoModule rec {
pname = "kustomize";
@ -25,9 +25,7 @@ buildGoModule rec {
modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Customization of kubernetes YAML configurations";
longDescription = ''
kustomize lets you customize raw, template-free YAML files for

6
pkgs/development/tools/misc/act/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "act";
@ -11,13 +11,11 @@ buildGoModule rec {
sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Run your GitHub Actions locally";
homepage = "https://github.com/nektos/act";
license = licenses.mit;

4
pkgs/development/tools/misc/circleci-cli/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "circleci-cli";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
preBuild = ''

6
pkgs/development/tools/misc/editorconfig-checker/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "editorconfig-checker";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A tool to verify that your files are in harmony with your .editorconfig";
homepage = "https://editorconfig-checker.github.io/";
license = licenses.mit;

6
pkgs/development/tools/misc/go-license-detector/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "go-license-detector";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Reliable project licenses detector";
homepage = "https://github.com/src-d/go-license-detector";
license = licenses.asl20;

6
pkgs/development/tools/misc/mkcert/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "mkcert";
@ -19,9 +19,7 @@ buildGoModule rec {
-X ${goPackagePath}/main.Version=${version}
'';
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://github.com/FiloSottile/mkcert;
description = "A simple tool for making locally-trusted development certificates";
license = licenses.bsd3;

6
pkgs/development/tools/misc/reviewdog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "reviewdog";
@ -13,13 +13,11 @@ buildGoModule rec {
modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cmd/reviewdog" ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
homepage = "https://github.com/reviewdog/reviewdog";
changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}";

6
pkgs/development/tools/misc/terracognita/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terracognita";
@ -13,13 +13,11 @@ buildGoModule rec {
modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "." ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
homepage = "https://github.com/cycloidio/terracognita";
license = licenses.mit;

6
pkgs/development/tools/mod/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "mod";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "cmd/mod" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Automated Semantic Import Versioning Upgrades for Go";
longDescription = ''
Command line tool to upgrade/downgrade Semantic Import Versioning in Go

6
pkgs/development/tools/pet/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "pet";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "." ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Simple command-line snippet manager, written in Go";
homepage = https://github.com/knqyf263/pet;
license = licenses.mit;

6
pkgs/development/tools/proto-contrib/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "proto-contrib";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Contributed tools and other packages on top of the Go proto package";
homepage = https://github.com/emicklei/proto-contrib;
license = licenses.mit;

6
pkgs/development/tools/protoc-gen-doc/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule {
pname = "protoc-gen-doc-unstable";
@ -13,9 +13,7 @@ buildGoModule {
modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Documentation generator plugin for Google Protocol Buffers";
longDescription = ''
This is a documentation generator plugin for the Google Protocol Buffers

6
pkgs/development/tools/prototool/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }:
buildGoModule rec {
pname = "prototool";
@ -13,8 +13,6 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg";
postInstall = ''
@ -25,7 +23,7 @@ buildGoModule rec {
subPackages = [ "cmd/prototool" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/uber/prototool";
description = "Your Swiss Army Knife for Protocol Buffers";
maintainers = [ maintainers.marsam ];

6
pkgs/development/web/flyctl/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "flyctl";
@ -11,8 +11,6 @@ buildGoModule rec {
sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
preBuild = ''
go generate ./...
'';
@ -24,7 +22,7 @@ buildGoModule rec {
modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd";
meta = with stdenv.lib; {
meta = with lib; {
description = "Command line tools for fly.io services";
homepage = "https://fly.io/";
license = licenses.asl20;

6
pkgs/development/web/minify/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "minify";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Minifiers for web formats";
license = licenses.mit;
homepage = "https://go.tacodewolff.nl/minify";

6
pkgs/os-specific/darwin/smimesign/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, libobjc, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "smimesign";
@ -13,11 +13,9 @@ buildGoModule rec {
modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ];
buildFlagsArray = "-ldflags=-X main.versionString=${version}";
meta = with stdenv.lib; {
meta = with lib; {
description = "An S/MIME signing utility for macOS and Windows that is compatible with Git.";
homepage = https://github.com/github/smimesign;

4
pkgs/servers/caddy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "caddy";
@ -16,8 +16,6 @@ buildGoModule rec {
};
modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
preBuild = ''
cat << EOF > caddy/main.go
package main

4
pkgs/servers/caddy/v2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, callPackage, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "caddy";
@ -16,8 +16,6 @@ buildGoModule rec {
};
modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
homepage = "https://caddyserver.com";
description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";

4
pkgs/servers/dns/coredns/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "coredns";
@ -15,8 +15,6 @@ buildGoModule rec {
modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
homepage = "https://coredns.io";
description = "A DNS server that runs middleware";

6
pkgs/servers/documize-community/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }:
{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }:
buildGoModule rec {
pname = "documize-community";
@ -15,8 +15,6 @@ buildGoModule rec {
nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = [ "edition/community.go" ];
postInstall = ''
@ -25,7 +23,7 @@ buildGoModule rec {
mv $out/bin/community $out/bin/documize
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS";
license = licenses.agpl3;
maintainers = with maintainers; [ ma27 elseym ];

6
pkgs/servers/echoip/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule {
pname = "echoip";
@ -13,8 +13,6 @@ buildGoModule {
modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
outputs = [ "out" "index" ];
postInstall = ''
@ -22,7 +20,7 @@ buildGoModule {
cp $src/index.html $index/index.html
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://github.com/mpolden/echoip;
license = licenses.bsd3;
maintainers = with maintainers; [ rvolosatovs ];

8
pkgs/servers/gobetween/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }:
{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }:
buildGoModule rec {
pname = "gobetween";
@ -14,10 +14,8 @@ buildGoModule rec {
modSha256 =
"dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildPhase = ''
make build${stdenv.lib.optionalString enableStatic "-static"}
make build${lib.optionalString enableStatic "-static"}
'';
installPhase = ''
@ -27,7 +25,7 @@ buildGoModule rec {
cp -r config $out/share
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Modern & minimalistic load balancer for the Сloud era";
homepage = "http://gobetween.io";
license = licenses.mit;

6
pkgs/servers/gortr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "gortr";
@ -12,9 +12,7 @@ buildGoModule rec {
};
modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "The RPKI-to-Router server used at Cloudflare";
homepage = "https://github.com/cloudflare/gortr/";
license = licenses.gpl3;

5
pkgs/servers/gotify/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv
, buildGoPackage
, lib
, fetchFromGitHub
, buildGoModule
, packr
, sqlite
, callPackage
, Security
}:
buildGoModule rec {
@ -28,8 +28,7 @@ buildGoModule rec {
--replace 'Version = "unknown"' 'Version = "${version}"'
'';
buildInputs = [ sqlite ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ sqlite ];
nativeBuildInputs = [ packr ];

7
pkgs/servers/imgproxy/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }:
{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }:
buildGoModule rec {
pname = "imgproxy";
@ -15,14 +15,13 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gobject-introspection vips ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ gobject-introspection vips ];
preBuild = ''
export CGO_LDFLAGS_ALLOW='-(s|w)'
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Fast and secure on-the-fly image processing server written in Go";
homepage = "https://imgproxy.net";
license = licenses.mit;

4
pkgs/servers/matterbridge/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchurl, Security }:
{ stdenv, buildGoModule, fetchurl }:
buildGoModule rec {
pname = "matterbridge";
@ -12,8 +12,6 @@ buildGoModule rec {
sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
homepage = "https://github.com/42wim/matterbridge";

4
pkgs/servers/mautrix-whatsapp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule {
pname = "mautrix-whatsapp-unstable";
@ -13,8 +13,6 @@ buildGoModule {
modSha256 = "01xwq0h3i8ai0294v8jdagksas48866lxcnkn4slwp3rnzv6cmbp";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";

4
pkgs/servers/minio/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "minio";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
subPackages = [ "." ];
buildFlagsArray = [''-ldflags=

6
pkgs/servers/monitoring/mtail/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "mtail";
@ -14,8 +14,6 @@ buildGoModule rec {
modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi";
subPackages = [ "cmd/mtail" ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
preBuild = ''
go generate -x ./internal/vm/
'';
@ -24,7 +22,7 @@ buildGoModule rec {
"-ldflags=-X main.Version=${version}"
];
meta = with stdenv.lib; {
meta = with lib; {
license = licenses.asl20;
homepage = "https://github.com/google/mtail";
description = "Tool for extracting metrics from application logs";

4
pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dnsmasq_exporter";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "A dnsmasq exporter for Prometheus";

4
pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "mikrotik-exporter-unstable";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Prometheus MikroTik device(s) exporter";

10
pkgs/servers/monitoring/prometheus/varnish-exporter.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }:
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }:
buildGoModule rec {
pname = "prometheus_varnish_exporter";
@ -15,8 +15,6 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = ''
wrapProgram $out/bin/prometheus_varnish_exporter \
--prefix PATH : "${varnish}/bin"
@ -24,10 +22,10 @@ buildGoModule rec {
doCheck = true;
meta = with stdenv.lib; {
meta = {
homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
description = "Varnish exporter for Prometheus";
license = licenses.mit;
maintainers = with maintainers; [ MostAwesomeDude willibutz ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
};
}

10
pkgs/servers/monitoring/sensu-go/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
let
generic = { subPackages, pname, postInstall ? "" }:
@ -20,8 +20,6 @@ let
modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildFlagsArray = let
versionPkg = "github.com/sensu/sensu-go/version";
in ''
@ -30,11 +28,11 @@ let
-X ${versionPkg}.BuildSHA=${shortRev}
'';
meta = with stdenv.lib; {
meta = {
homepage = "https://sensu.io";
description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
license = licenses.mit;
maintainers = with maintainers; [ thefloweringash ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ thefloweringash ];
};
};
in

4
pkgs/servers/monitoring/thanos/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
version = "0.11.0";
@ -12,8 +12,6 @@ buildGoModule rec {
modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
subPackages = "cmd/thanos";
buildFlagsArray = let t = "github.com/prometheus/common/version"; in ''

7
pkgs/servers/nosql/victoriametrics/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "VictoriaMetrics";
@ -12,10 +12,7 @@ buildGoModule rec {
};
modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://victoriametrics.com/";
description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
license = licenses.asl20;

6
pkgs/servers/sql/dolt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, Security }:
{ stdenv, fetchFromGitHub, lib, buildGoModule }:
buildGoModule rec {
pname = "dolt";
@ -15,9 +15,7 @@ buildGoModule rec {
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Relational database with version control and CLI a-la Git.";
homepage = "https://github.com/liquidata-inc/dolt";
license = licenses.asl20;

4
pkgs/servers/web-apps/shiori/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "shiori";
@ -13,8 +13,6 @@ buildGoModule rec {
sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "Simple bookmark manager built with Go";
homepage = "https://github.com/go-shiori/shiori";

4
pkgs/shells/elvish/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "elvish";
@ -20,8 +20,6 @@ buildGoModule rec {
modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A friendly and expressive command shell";
longDescription = ''

6
pkgs/shells/zsh/zsh-history/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests, Security }:
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests }:
buildGoModule rec {
pname = "zsh-history";
@ -13,8 +13,6 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42";
goPackagePath = "github.com/b4b4r07/history";
@ -24,7 +22,7 @@ buildGoModule rec {
installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A CLI to provide enhanced history for your ZSH shell";
license = licenses.mit;
homepage = https://github.com/b4b4r07/history;

6
pkgs/tools/admin/aws-vault/default.nix
View File

@ -1,4 +1,4 @@
{ buildGoModule, stdenv, fetchFromGitHub, Security }:
{ buildGoModule, lib, fetchFromGitHub }:
buildGoModule rec {
pname = "aws-vault";
version = "5.3.2";
@ -13,15 +13,13 @@ buildGoModule rec {
modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
subPackages = [ "." ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
# set the version. see: aws-vault's Makefile
buildFlagsArray = ''
-ldflags=
-X main.Version=v${version}
'';
meta = with stdenv.lib; {
meta = with lib; {
description =
"A vault for securely storing and accessing AWS credentials in development environments";
homepage = "https://github.com/99designs/aws-vault";

6
pkgs/tools/admin/awsweeper/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "awsweeper";
@ -13,9 +13,7 @@ buildGoModule rec {
modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A tool to clean out your AWS account";
homepage = "https://github.com/cloudetc/awsweeper/";
license = licenses.mpl20;

4
pkgs/tools/admin/berglas/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "berglas";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A tool for managing secrets on Google Cloud";
homepage = "https://github.com/GoogleCloudPlatform/berglas";

4
pkgs/tools/admin/certigo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, Security }:
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "certigo";
@ -13,8 +13,6 @@ buildGoModule rec {
modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
description = "A utility to examine and validate certificates in a variety of formats";
homepage = "https://github.com/square/certigo";

Some files were not shown because too many files have changed in this diff Show More