From 066db11215a2287a88a80ec71595cd8764563444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Mar 2020 07:33:21 +0000 Subject: [PATCH] Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin" This reverts commit 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c, reversing changes made to afd997aab6e9b7a322198092c7828d6c560ac06f. Instead we propagate those frameworks from the compiler again --- pkgs/applications/blockchains/go-ethereum.nix | 4 +- pkgs/applications/blockchains/lnd.nix | 8 +- pkgs/applications/editors/glow/default.nix | 6 +- pkgs/applications/misc/archiver/default.nix | 7 +- pkgs/applications/misc/exercism/default.nix | 4 +- .../applications/misc/geoipupdate/default.nix | 4 +- pkgs/applications/misc/hugo/default.nix | 6 +- pkgs/applications/misc/todoist/default.nix | 10 +- pkgs/applications/misc/wtf/default.nix | 7 +- .../networking/cluster/argo/default.nix | 6 +- .../networking/cluster/argocd/default.nix | 6 +- .../networking/cluster/atlantis/default.nix | 4 +- .../networking/cluster/fluxctl/default.nix | 4 +- .../networking/cluster/helm/default.nix | 5 +- .../networking/cluster/helmfile/default.nix | 22 +- .../cluster/hetzner-kube/default.nix | 12 +- .../networking/cluster/jx/default.nix | 6 +- .../networking/cluster/k9s/default.nix | 4 +- .../networking/cluster/kubeseal/default.nix | 6 +- .../networking/cluster/kubeval/default.nix | 6 +- .../networking/cluster/linkerd/default.nix | 4 +- .../networking/cluster/minikube/default.nix | 6 +- .../networking/cluster/prow/default.nix | 6 +- .../networking/cluster/qbec/default.nix | 6 +- .../cluster/terraform-providers/default.nix | 5 +- .../elasticsearch/default.nix | 4 +- .../networking/hydroxide/default.nix | 6 +- .../instant-messengers/gomuks/default.nix | 4 +- .../networking/ipfs-cluster/default.nix | 5 +- pkgs/applications/networking/ipfs/default.nix | 4 +- .../networking/mailreaders/aerc/default.nix | 5 +- .../networking/syncthing/default.nix | 4 +- .../networking/websocketd/default.nix | 6 +- .../git-and-tools/default.nix | 20 +- .../git-and-tools/ghq/default.nix | 4 +- .../git-and-tools/git-bug/default.nix | 4 +- .../git-and-tools/git-subtrac/default.nix | 6 +- .../git-and-tools/lab/default.nix | 4 +- .../git-and-tools/lefthook/default.nix | 4 +- .../interpreters/joker/default.nix | 4 +- pkgs/development/libraries/packr/default.nix | 7 +- .../tools/analysis/tflint/default.nix | 6 +- pkgs/development/tools/azcopy/default.nix | 4 +- pkgs/development/tools/bazelisk/default.nix | 4 +- pkgs/development/tools/conftest/default.nix | 6 +- .../drone-cli/default.nix | 13 +- .../continuous-integration/drone/default.nix | 4 +- .../continuous-integration/fly/default.nix | 6 +- pkgs/development/tools/cue/default.nix | 4 +- .../tools/database/dbmate/default.nix | 4 +- .../tools/database/dbmate/deps.nix | 84 ++++ pkgs/development/tools/dive/default.nix | 5 +- pkgs/development/tools/go-tools/default.nix | 7 +- .../tools/golangci-lint/default.nix | 6 +- pkgs/development/tools/hcloud/default.nix | 4 +- pkgs/development/tools/kcli/default.nix | 4 +- pkgs/development/tools/kubeprompt/default.nix | 4 +- pkgs/development/tools/kustomize/default.nix | 6 +- pkgs/development/tools/misc/act/default.nix | 6 +- .../tools/misc/circleci-cli/default.nix | 4 +- .../misc/editorconfig-checker/default.nix | 6 +- .../misc/go-license-detector/default.nix | 6 +- .../development/tools/misc/mkcert/default.nix | 6 +- .../tools/misc/reviewdog/default.nix | 6 +- .../tools/misc/terracognita/default.nix | 6 +- pkgs/development/tools/mod/default.nix | 6 +- pkgs/development/tools/pet/default.nix | 6 +- .../tools/proto-contrib/default.nix | 6 +- .../tools/protoc-gen-doc/default.nix | 6 +- pkgs/development/tools/prototool/default.nix | 6 +- pkgs/development/web/flyctl/default.nix | 6 +- pkgs/development/web/minify/default.nix | 6 +- pkgs/os-specific/darwin/smimesign/default.nix | 6 +- pkgs/servers/caddy/default.nix | 4 +- pkgs/servers/caddy/v2.nix | 4 +- pkgs/servers/dns/coredns/default.nix | 4 +- pkgs/servers/documize-community/default.nix | 6 +- pkgs/servers/echoip/default.nix | 6 +- pkgs/servers/gobetween/default.nix | 8 +- pkgs/servers/gortr/default.nix | 6 +- pkgs/servers/gotify/default.nix | 5 +- pkgs/servers/imgproxy/default.nix | 7 +- pkgs/servers/matterbridge/default.nix | 4 +- pkgs/servers/mautrix-whatsapp/default.nix | 4 +- pkgs/servers/minio/default.nix | 4 +- pkgs/servers/monitoring/mtail/default.nix | 6 +- .../prometheus/dnsmasq-exporter.nix | 4 +- .../prometheus/mikrotik-exporter.nix | 4 +- .../prometheus/varnish-exporter.nix | 10 +- pkgs/servers/monitoring/sensu-go/default.nix | 10 +- pkgs/servers/monitoring/thanos/default.nix | 4 +- .../servers/nosql/victoriametrics/default.nix | 7 +- pkgs/servers/sql/dolt/default.nix | 6 +- pkgs/servers/web-apps/shiori/default.nix | 4 +- pkgs/shells/elvish/default.nix | 4 +- pkgs/shells/zsh/zsh-history/default.nix | 6 +- pkgs/tools/admin/aws-vault/default.nix | 6 +- pkgs/tools/admin/awsweeper/default.nix | 6 +- pkgs/tools/admin/berglas/default.nix | 4 +- pkgs/tools/admin/certigo/default.nix | 4 +- pkgs/tools/admin/clair/default.nix | 8 +- pkgs/tools/admin/eksctl/default.nix | 6 +- pkgs/tools/admin/iamy/default.nix | 6 +- pkgs/tools/admin/lego/default.nix | 6 +- pkgs/tools/misc/chezmoi/default.nix | 4 +- pkgs/tools/misc/docui/default.nix | 4 +- pkgs/tools/misc/gotify-cli/default.nix | 6 +- pkgs/tools/misc/kepubify/default.nix | 6 +- pkgs/tools/misc/mutagen/default.nix | 6 +- pkgs/tools/misc/pgcenter/default.nix | 4 +- pkgs/tools/misc/pgmetrics/default.nix | 4 +- pkgs/tools/networking/cassowary/default.nix | 6 +- pkgs/tools/networking/clash/default.nix | 4 +- pkgs/tools/networking/corerad/default.nix | 4 +- pkgs/tools/networking/croc/default.nix | 4 +- pkgs/tools/networking/dnsproxy/default.nix | 4 +- pkgs/tools/networking/frp/default.nix | 6 +- pkgs/tools/networking/grpcui/default.nix | 6 +- pkgs/tools/networking/hey/default.nix | 6 +- .../tools/networking/minio-client/default.nix | 4 +- pkgs/tools/networking/nebula/default.nix | 6 +- pkgs/tools/networking/obfs4/default.nix | 6 +- pkgs/tools/networking/shadowfox/default.nix | 6 +- pkgs/tools/networking/tendermint/default.nix | 4 +- pkgs/tools/networking/termshark/default.nix | 5 +- pkgs/tools/networking/yggdrasil/default.nix | 6 +- .../mynewt-newt/default.nix | 4 +- pkgs/tools/security/age/default.nix | 6 +- pkgs/tools/security/gobuster/default.nix | 7 +- pkgs/tools/security/saml2aws/default.nix | 4 +- pkgs/tools/security/sops/default.nix | 4 +- pkgs/tools/system/ctop/default.nix | 6 +- pkgs/top-level/all-packages.nix | 475 +++++------------- 133 files changed, 443 insertions(+), 861 deletions(-) create mode 100644 pkgs/development/tools/database/dbmate/deps.nix diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 80e17cf1138a..d8660967a4e0 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -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 ]; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index 4be19beedc39..dd45746c8df5 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -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 ]; }; } diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 80fdcc8a09c1..928291940cfe 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -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; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 8c79d867c831..64b592b78714 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -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; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 81c2d9782997..a071761599a3 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -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; { diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 71ea8a3d43f4..b7b90448e4bc 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -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"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index dc1f24368118..46abf3696169 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -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 = [ "." ]; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index a625c8340558..74b2b770215c 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -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; }; } diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 8c34baba5828..f12f96871c00 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -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; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 25fb33399c0d..f02b64e92c8b 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -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; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 51635292fa13..7f9ebda93c0a 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -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; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index ce3a1730ae54..cb846060a3de 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -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"; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 75e097131ea8..982add3d517f 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -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; { diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 822df7656554..88ca9b3da947 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -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 diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2de07e9fdc7d..ee7c4ab9cbdd 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -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; }; } diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 8a59bf3197a9..1d9940c8f318 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -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; }; } diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index f817a68ced19..88aa8777ee5e 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 956d7b106b97..99326a20bfa0 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -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"; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 092cee5f7a27..6d35d233d4f4 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -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; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 046052f78bef..54be5956040c 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -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; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index d52b25c2e015..8c0265d14914 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -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; { diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index ebd78424f4af..f49f1768ced4 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -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/... diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index e3eb24b23746..1c802802c096 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -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 diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 4e475320a613..4a8b2a2e6648 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -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; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 1487f8ad875f..4e7a2c6964cb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -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 {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 2f13000c0cde..1aadbbc5ccd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix @@ -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 diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index d3f45f7f0385..75c1cdaece96 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -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; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 27790c2c9e08..a36f72c03d08 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -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"; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 9bf7faf51f3e..a214f222d566 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -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 ]; }; } + diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index c3a31f4e290f..4f71fcf3b745 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -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/; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index e0f98208e7ab..7b24ed93406e 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -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"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 0fd3a5ca2801..516acab10f8b 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 8d0e92488dbb..4160e70b9c44 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c4a99cf18584..a4b3ac1a65aa 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 { }; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 34829c14b7bb..d0c468ab68ea 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -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} diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index fdb5a6c53fdf..ed0c8680d753 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -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} diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 9ccf3c606a2a..07c63ea0119b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -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; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 8780ce4a2205..3e47631caf69 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -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 = '' diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index c80cff15265e..9fc89d520ae9 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -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"; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 1db2dd60197b..ed82f76eec24 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -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 ./... ''; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index b0c7ac3cab6b..4482a9cd312d 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -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; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 2cc9182cd68c..52a11738cf82 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -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}"; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 40741d96f562..328092feafc5 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -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"; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index a737ddbb0fb6..5780cf4382a7 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -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 = '' diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 76e53fd73b2a..7ce2594d84f6 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -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; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index c6e4878d52c4..a3df81d26053 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -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; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index e1f0a8de3b87..05257f65af52 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -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; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 4093e7e01728..e5454796b7e4 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -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; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 4950e885e25c..98bf5249b626 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 57aa9c654d7f..efc20b6972be 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -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; diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix new file mode 100644 index 000000000000..97bfc10b20af --- /dev/null +++ b/pkgs/development/tools/database/dbmate/deps.nix @@ -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"; + }; + } +] diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 91889e80c044..5d4de99ffdbf 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -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}" ]; diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index b047689b81f9..1fd17060bd4f 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -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; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 00858e94bc55..14311b0c7a51 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -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; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index c20f3b9dc124..477a476dfe78 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -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 = '' diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 0d42df3b5e4d..bbcb10a354cf 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -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; { diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 0910c061ee50..7c6f3f3396cf 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -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"; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce173e89a2c5..e60181e9bc4c 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -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 diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 17ff15265f25..de1cf939e6ae 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -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; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 0ab126b63e73..fde1c68d34d0 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -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 = '' diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 335cd2f25247..88c43a8c42a5 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -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; diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 7ab7ff8b742c..6675f7ed3e25 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -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; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 6a114a8de8ba..ae0a4a6dfe21 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -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; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index aecd373f09e9..9af294716ff3 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -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}"; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 67e8df9561ff..26aa50f7f7a1 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -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; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index cc94692c023a..67b829877b04 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -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 diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index f1096e479a78..e7f4fce3c4d4 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -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; diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index adb0df28ce16..836683895565 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -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; diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index c25b2d56fe63..77c1df6f43e3 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -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 diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index 15a854e4d86c..37b0f1fdf8db 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -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 ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 05f07fd02608..85165d501d97 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -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; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index cd602317c70d..3752519d0609 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -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"; diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 6e799f1caaaa..9efa230d3b72 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -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; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 8b51e584e3ec..bcd4b7065b58 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -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 diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 7330388a7859..c0b2134abded 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -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"; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 8388968298ef..017842f39dc1 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -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"; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index a6477d61e984..7780d900badf 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -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 ]; diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index ae6057c34697..b3402933f9fe 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -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 ]; diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index e66d5581b3c8..ff59ad53ed1c 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -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; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 3e5dfc87f0ee..35c6e1452437 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -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; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 275aaa5d68bc..f2014aac9fdc 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -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 ]; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index c7d0d910ac1e..4cdfddcff6f4 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -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; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 2eec5d52bb9c..556625016f25 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -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"; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 648b4830661d..7215464ea5a3 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -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"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1fae973066aa..858f8899501d 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -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= diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 75b58b65a9cc..64966e183fea 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -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"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index 773fddd311bb..c8013e6bc15c 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -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"; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 96526d246a6d..12341eee911e 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -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"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index a0e3c6b1783c..d77675671950 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -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 ]; }; } diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index adba0277bf77..f109b08d1a6f 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -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 diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index a246249d7d71..f307032f4141 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -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 '' diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index f85c4aebd512..2d357712096a 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -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; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 27ab7d444bf1..dbface601f54 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -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; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index bd17f2f267c6..dd4cdc08287b 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -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"; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 228692efe852..ad2e845f9bc8 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -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 = '' diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 382b76916d31..ece3c87cb664 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -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; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 3e145f732362..48a1de61cd80 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -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"; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 1ea54953701d..661747c2fd0d 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -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; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index d088184f7a17..c1c46da41b75 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -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"; diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 89c6b8996fa3..5474cb254298 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -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"; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index a12b8abe1206..3f4d00736ad9 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }: buildGoModule rec { pname = "clair"; @@ -13,16 +13,14 @@ buildGoModule rec { modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/clair \ - --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}" + --prefix PATH : "${lib.makeBinPath [ rpm xz ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vulnerability Static Analysis for Containers"; homepage = "https://github.com/quay/clair"; license = licenses.asl20; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index c700e4f397c7..4c01383f8986 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "eksctl"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; @@ -27,7 +25,7 @@ buildGoModule rec { $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 6a1ec948d907..e09cd2f52853 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; version = "2.3.2"; + goPackagePath = "github.com/99designs/iamy"; + src = fetchFromGitHub { owner = "99designs"; repo = "iamy"; @@ -13,8 +15,6 @@ buildGoModule rec { modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w '']; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 0cb614c12d1f..72c61ceecaf2 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "lego"; @@ -14,13 +14,11 @@ buildGoModule rec { modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; subPackages = [ "cmd/lego" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 979a658ac022..b2fb6925abac 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" ]; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index c8f3dbf8009c..0329c1bc4a69 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 56462aa3d303..a4b9af09712e 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "gotify-cli"; @@ -17,9 +17,7 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; homepage = https://github.com/gotify/cli; description = "A command line interface for pushing messages to gotify/server."; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index a7b7da451fb7..207492a89449 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "kepubify"; @@ -15,11 +15,9 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." "covergen" "seriesmeta" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "EPUB to KEPUB converter"; homepage = "https://pgaskin.net/kepubify"; license = licenses.mit; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index c029f38acb2c..8940fef2a0dd 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mutagen"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}"; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 9eed1aaffd8e..7cb810b2fe2d 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { homepage = https://pgcenter.org/; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 04e106ca5522..b702ffc1703d 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 5b9ba71f8c9b..6156f43b04b8 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cassowary"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 8e7499caa479..234fd0b31afa 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; @@ -14,8 +14,6 @@ buildGoModule rec { goPackagePath = "github.com/Dreamacro/clash"; modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/constant.Version=${version}" diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 0cfaddcf06ae..96798c1c17e9 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "corerad"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index d7ab830479ea..0412020518e5 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "croc"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 89173e7b4277..8296600cf3d3 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; homepage = "https://github.com/AdguardTeam/dnsproxy"; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 7323c914bfa1..f44e2208646c 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "frp"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index de2b3f787986..58e698ed7081 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "grpcui"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; homepage = "https://github.com/fullstorydev/grpcui"; license = licenses.mit; diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index 69cfa4526029..d65d5c9e3235 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "hey"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index b8cf93bc2d3f..885ffbe91579 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - subPackages = [ "." ]; preBuild = '' diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index f78d7129c34a..3411aca55519 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "nebula"; @@ -13,13 +13,11 @@ buildGoModule rec { modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' Nebula is a scalable overlay networking tool with a focus on performance, diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 93ebdeb0720c..005abb0968b6 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildGoModule, Security }: +{ lib, fetchgit, buildGoModule }: buildGoModule rec { pname = "obfs4"; @@ -12,9 +12,7 @@ buildGoModule rec { modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 37d5edaec452..f2ae143e1b9e 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; buildFlags = [ "--tags" "release" ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 91378757af1d..0b9c254deeb4 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; homepage = https://tendermint.com/; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index a24ff25ef2ba..35b92e0f653b 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }: +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; @@ -12,8 +12,7 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wireshark-cli ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ wireshark-cli ]; modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 605801b6ab73..3bf3b97c2355 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Foundation }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yggdrasil"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ]; - # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to # be granted write permission to /run. @@ -29,7 +27,7 @@ buildGoModule rec { -s -w ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 6afba001e08d..b40257d42f4b 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; @@ -24,8 +24,6 @@ buildGoModule rec { modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { homepage = https://mynewt.apache.org/; description = "Build and package management tool for embedded development."; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 0448faf53b76..bde597ba9f30 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "age"; @@ -18,9 +18,7 @@ buildGoModule rec { sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index c9348b2f23aa..c3426bee965b 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -17,9 +16,7 @@ buildGoModule rec { modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; license = licenses.asl20; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 811b95d25245..011747890818 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ]; - subPackages = [ "." "cmd/saml2aws" ]; buildFlagsArray = '' diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index d028b9787dba..8aa2e219e7df 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index b9ea0c04aa85..4f492def1624 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ctop"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e469380abbd..60b4afe8386b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,9 +161,7 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest { - inherit (darwin.apple_sdk.frameworks) Security; - }; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; @@ -177,13 +175,9 @@ in hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. - proto-contrib = callPackage ../development/tools/proto-contrib { - inherit (darwin.apple_sdk.frameworks) Security; - }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; demoit = callPackage ../servers/demoit { }; @@ -197,9 +191,7 @@ in dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - archiver = callPackage ../applications/misc/archiver { - inherit (darwin.apple_sdk.frameworks) Security; - }; + archiver = callPackage ../applications/misc/archiver { }; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; @@ -219,9 +211,7 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; - docui = callPackage ../tools/misc/docui { - inherit (darwin.apple_sdk.frameworks) Security; - }; + docui = callPackage ../tools/misc/docui { }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -298,18 +288,13 @@ in # Version 2.6.0 fails to build with go 1.13 due to nested modules: # go: directory v2/packr2 is outside main module buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; - pet = callPackage ../development/tools/pet { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pet = callPackage ../development/tools/pet { }; run = callPackage ../development/tools/run { }; - mod = callPackage ../development/tools/mod { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mod = callPackage ../development/tools/mod { }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -543,9 +528,7 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act { - inherit (darwin.apple_sdk.frameworks) Security; - }; + act = callPackage ../development/tools/misc/act {}; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -570,9 +553,7 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aerc = callPackage ../applications/networking/mailreaders/aerc { }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -759,27 +740,19 @@ in aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; - aws-vault = callPackage ../tools/admin/aws-vault { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aws-vault = callPackage ../tools/admin/aws-vault { }; - iamy = callPackage ../tools/admin/iamy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + iamy = callPackage ../tools/admin/iamy { }; azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; - azure-storage-azcopy = callPackage ../development/tools/azcopy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + berglas = callPackage ../tools/admin/berglas/default.nix { }; brakeman = callPackage ../development/tools/analysis/brakeman { }; @@ -851,22 +824,16 @@ in calls = callPackage ../applications/networking/calls { }; - certigo = callPackage ../tools/admin/certigo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + certigo = callPackage ../tools/admin/certigo { }; - chezmoi = callPackage ../tools/misc/chezmoi { - inherit (darwin.apple_sdk.frameworks) Security; - }; + chezmoi = callPackage ../tools/misc/chezmoi { }; chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; }; - clair = callPackage ../tools/admin/clair { - inherit (darwin.apple_sdk.frameworks) Security; - }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -898,9 +865,7 @@ in crc32c = callPackage ../development/libraries/crc32c { }; - cue = callPackage ../development/tools/cue { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cue = callPackage ../development/tools/cue { }; deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; @@ -925,9 +890,7 @@ in sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { - inherit (darwin.apple_sdk.frameworks) Security; - }; + elvish = callPackage ../shells/elvish { }; emplace = callPackage ../tools/package-management/emplace { }; @@ -1143,9 +1106,7 @@ in awstats = callPackage ../tools/system/awstats { }; - awsweeper = callPackage ../tools/admin/awsweeper { - inherit (darwin.apple_sdk.frameworks) Security; - }; + awsweeper = callPackage ../tools/admin/awsweeper { }; axel = callPackage ../tools/networking/axel { libssl = openssl; @@ -1410,12 +1371,8 @@ in ''; }); - caddy = callPackage ../servers/caddy { - inherit (darwin.apple_sdk.frameworks) Security; - }; - caddy2 = callPackage ../servers/caddy/v2.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + caddy = callPackage ../servers/caddy { }; + caddy2 = callPackage ../servers/caddy/v2.nix { }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1467,13 +1424,9 @@ in ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cassowary = callPackage ../tools/networking/cassowary { }; - croc = callPackage ../tools/networking/croc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + croc = callPackage ../tools/networking/croc { }; cddl = callPackage ../development/tools/cddl { }; @@ -1493,9 +1446,7 @@ in clac = callPackage ../tools/misc/clac {}; - clash = callPackage ../tools/networking/clash { - inherit (darwin.apple_sdk.frameworks) Security; - }; + clash = callPackage ../tools/networking/clash { }; clasp = callPackage ../tools/misc/clasp { }; @@ -1760,9 +1711,7 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; - eksctl = callPackage ../tools/admin/eksctl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + eksctl = callPackage ../tools/admin/eksctl { }; elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; @@ -1916,9 +1865,7 @@ in gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotify-cli = callPackage ../tools/misc/gotify-cli { }; gping = callPackage ../tools/networking/gping { }; @@ -2498,9 +2445,7 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; @@ -2671,9 +2616,7 @@ in caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; - age = callPackage ../tools/security/age { - inherit (darwin.apple_sdk.frameworks) Security; - }; + age = callPackage ../tools/security/age { }; brotli = callPackage ../tools/compression/brotli { }; @@ -2898,9 +2841,7 @@ in dnsmasq = callPackage ../tools/networking/dnsmasq { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dnsproxy = callPackage ../tools/networking/dnsproxy { }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -3003,13 +2944,9 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drone = callPackage ../development/tools/continuous-integration/drone { - inherit (darwin.apple_sdk.frameworks) Security; - }; + drone = callPackage ../development/tools/continuous-integration/drone { }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; dropbear = callPackage ../tools/networking/dropbear { }; @@ -3932,7 +3869,6 @@ in grpcui = callPackage ../tools/networking/grpcui { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ @@ -4159,9 +4095,7 @@ in hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; - hey = callPackage ../tools/networking/hey { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hey = callPackage ../tools/networking/hey { }; hhpc = callPackage ../tools/misc/hhpc { }; @@ -4359,12 +4293,9 @@ in # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) # This is fixed in master, but release containing the fix does not exist yet. buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipget = callPackage ../applications/networking/ipget { }; @@ -4608,9 +4539,7 @@ in lefthook = gitAndTools.lefthook; - lego = callPackage ../tools/admin/lego { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lego = callPackage ../tools/admin/lego { }; leocad = callPackage ../applications/graphics/leocad { }; @@ -4703,9 +4632,7 @@ in mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); - mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; mcfly = callPackage ../tools/misc/mcfly { inherit (darwin.apple_sdk.frameworks) Security; @@ -4742,9 +4669,7 @@ in motion = callPackage ../applications/video/motion { }; - mtail = callPackage ../servers/monitoring/mtail { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mtail = callPackage ../servers/monitoring/mtail { }; multitail = callPackage ../tools/misc/multitail { }; @@ -5191,9 +5116,7 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -5312,9 +5235,7 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; - mutagen = callPackage ../tools/misc/mutagen { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; - }; + mutagen = callPackage ../tools/misc/mutagen { }; mycli = callPackage ../tools/admin/mycli { }; @@ -5352,9 +5273,7 @@ in ndppd = callPackage ../applications/networking/ndppd { }; - nebula = callPackage ../tools/networking/nebula { - inherit (darwin.apple_sdk.frameworks) Security; - }; + nebula = callPackage ../tools/networking/nebula { }; nemiver = callPackage ../development/tools/nemiver { }; @@ -5582,9 +5501,7 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + obfs4 = callPackage ../tools/networking/obfs4 { }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -5924,13 +5841,9 @@ in pg_top = callPackage ../tools/misc/pg_top { }; - pgcenter = callPackage ../tools/misc/pgcenter { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pgcenter = callPackage ../tools/misc/pgcenter { }; - pgmetrics = callPackage ../tools/misc/pgmetrics { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pgmetrics = callPackage ../tools/misc/pgmetrics { }; pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation @@ -6468,10 +6381,7 @@ in samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation IOKit; - }; + saml2aws = callPackage ../tools/security/saml2aws {}; samplicator = callPackage ../tools/networking/samplicator { }; @@ -7772,9 +7682,7 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - yggdrasil = callPackage ../tools/networking/yggdrasil { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -7827,9 +7735,7 @@ in zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { - inherit (darwin.apple_sdk.frameworks) Security; - }; + zsh-history = callPackage ../shells/zsh/zsh-history { }; zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; @@ -8145,9 +8051,7 @@ in scry = callPackage ../development/tools/scry {}; - dbmate = callPackage ../development/tools/database/dbmate { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -8175,9 +8079,7 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - flyctl = callPackage ../development/web/flyctl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + flyctl = callPackage ../development/web/flyctl { }; fpc = callPackage ../development/compilers/fpc { }; @@ -9348,9 +9250,7 @@ in jmeter = callPackage ../applications/networking/jmeter {}; - joker = callPackage ../development/interpreters/joker { - inherit (darwin.apple_sdk.frameworks) Security; - }; + joker = callPackage ../development/interpreters/joker {}; davmail = callPackage ../applications/networking/davmail {}; @@ -9996,9 +9896,7 @@ in go = go_1_12; }; - bazelisk = callPackage ../development/tools/bazelisk { - inherit (darwin.apple_sdk.frameworks) Security; - }; + bazelisk = callPackage ../development/tools/bazelisk { }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; @@ -10266,9 +10164,7 @@ in binutils = binutils; }; - dive = callPackage ../development/tools/dive { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dive = callPackage ../development/tools/dive { }; doclifter = callPackage ../development/tools/misc/doclifter { }; @@ -10278,9 +10174,7 @@ in doit = callPackage ../development/tools/build-managers/doit { }; - dolt = callPackage ../servers/sql/dolt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dolt = callPackage ../servers/sql/dolt { }; dot2tex = pythonPackages.dot2tex; @@ -10299,9 +10193,7 @@ in drush = callPackage ../development/tools/misc/drush { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { - inherit (darwin.apple_sdk.frameworks) Security; - }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -10342,9 +10234,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fly = callPackage ../development/tools/continuous-integration/fly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fly = callPackage ../development/tools/continuous-integration/fly { }; foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; @@ -10353,9 +10243,7 @@ in frame = callPackage ../development/libraries/frame { }; - frp = callPackage ../tools/networking/frp { - inherit (darwin.apple_sdk.frameworks) Security; - }; + frp = callPackage ../tools/networking/frp { }; fsatrace = callPackage ../development/tools/misc/fsatrace { }; @@ -10424,9 +10312,7 @@ in gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - gotify-server = callPackage ../servers/gotify { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotify-server = callPackage ../servers/gotify { }; gotty = callPackage ../servers/gotty { }; @@ -10470,9 +10356,7 @@ in halfempty = callPackage ../development/tools/halfempty {}; - hcloud = callPackage ../development/tools/hcloud { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hcloud = callPackage ../development/tools/hcloud { }; help2man = callPackage ../development/tools/misc/help2man { }; @@ -10554,17 +10438,13 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; - kubeprompt = callPackage ../development/tools/kubeprompt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubeprompt = callPackage ../development/tools/kubeprompt { }; kubicorn = callPackage ../development/tools/kubicorn { }; kubie = callPackage ../development/tools/kubie { }; - kustomize = callPackage ../development/tools/kustomize { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kustomize = callPackage ../development/tools/kustomize { }; ktlint = callPackage ../development/tools/ktlint { }; @@ -10621,18 +10501,14 @@ in mdl = callPackage ../development/tools/misc/mdl { }; - minify = callPackage ../development/web/minify { - inherit (darwin.apple_sdk.frameworks) Security; - }; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; - mkcert = callPackage ../development/tools/misc/mkcert { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mkcert = callPackage ../development/tools/misc/mkcert { }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; @@ -10812,9 +10688,7 @@ in withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { - inherit (darwin.apple_sdk.frameworks) Security; - }; + reviewdog = callPackage ../development/tools/misc/reviewdog { }; rman = callPackage ../development/tools/misc/rman { }; @@ -10956,9 +10830,7 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; - terracognita = callPackage ../development/tools/misc/terracognita { - inherit (darwin.apple_sdk.frameworks) Security; - }; + terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; @@ -10979,15 +10851,11 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - tflint = callPackage ../development/tools/analysis/tflint { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { }; - todoist = callPackage ../applications/misc/todoist { - inherit (darwin.apple_sdk.frameworks) Security; - }; + todoist = callPackage ../applications/misc/todoist { }; todoist-electron = callPackage ../applications/misc/todoist-electron { }; @@ -15612,7 +15480,6 @@ in gobetween = callPackage ../servers/gobetween { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; h2o = callPackage ../servers/http/h2o { }; @@ -15642,9 +15509,7 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; - imgproxy = callPackage ../servers/imgproxy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + imgproxy = callPackage ../servers/imgproxy { }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -15683,9 +15548,7 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - inherit (darwin.apple_sdk.frameworks) Security; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -15699,9 +15562,7 @@ in micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; - }; + minio = callPackage ../servers/minio { }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -15893,7 +15754,7 @@ in mysql = mariadb; # TODO: move to aliases.nix mongodb = hiPrio mongodb-3_4; - + mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix { sasl = cyrus_sasl; boost = boost160; @@ -16046,9 +15907,7 @@ in prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; - prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; @@ -16056,9 +15915,7 @@ in prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; - prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; @@ -16080,7 +15937,6 @@ in # Version 1.5.1 fails to build with go 1.13 due to test failure # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { @@ -16197,9 +16053,7 @@ in sensu = callPackage ../servers/monitoring/sensu { }; - inherit (callPackages ../servers/monitoring/sensu-go { - inherit (darwin.apple_sdk.frameworks) Security; - }) + inherit (callPackages ../servers/monitoring/sensu-go { }) sensu-go-agent sensu-go-backend sensu-go-cli; @@ -16247,9 +16101,7 @@ in tailscale = callPackage ../servers/tailscale { }; - thanos = callPackage ../servers/monitoring/thanos { - inherit (darwin.apple_sdk.frameworks) Security; - }; + thanos = callPackage ../servers/monitoring/thanos { }; inherit (callPackages ../servers/http/tomcat { }) tomcat7 @@ -16274,9 +16126,7 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - shiori = callPackage ../servers/web-apps/shiori { - inherit (darwin.apple_sdk.frameworks) Security; - }; + shiori = callPackage ../servers/web-apps/shiori { }; inherit (callPackages ../servers/web-apps/matomo {}) matomo @@ -16289,9 +16139,7 @@ in unifiStable; unifi = unifiStable; - victoriametrics = callPackage ../servers/nosql/victoriametrics { - inherit (darwin.apple_sdk.frameworks) Security; - }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -16492,13 +16340,9 @@ in conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; - coredns = callPackage ../servers/dns/coredns { - inherit (darwin.apple_sdk.frameworks) Security; - }; + coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { - inherit (darwin.apple_sdk.frameworks) Security; - }; + corerad = callPackage ../tools/networking/corerad { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -17306,9 +17150,7 @@ in golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { - inherit (darwin.apple_sdk.frameworks) Security; - }; + golangci-lint = callPackage ../development/tools/golangci-lint { }; gocyclo = callPackage ../development/tools/gocyclo { }; @@ -17322,9 +17164,7 @@ in govendor = callPackage ../development/tools/govendor { }; - go-tools = callPackage ../development/tools/go-tools { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go-tools = callPackage ../development/tools/go-tools { }; gotools = callPackage ../development/tools/gotools { inherit (darwin.apple_sdk.frameworks) Security; @@ -17435,9 +17275,7 @@ in procdump = callPackage ../os-specific/linux/procdump { }; - prototool = callPackage ../development/tools/prototool { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); @@ -17514,10 +17352,7 @@ in smem = callPackage ../os-specific/linux/smem { }; - smimesign = callPackage ../os-specific/darwin/smimesign { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Security; - }; + smimesign = callPackage ../os-specific/darwin/smimesign { }; speedometer = callPackage ../os-specific/linux/speedometer { }; @@ -17853,9 +17688,7 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - documize-community = callPackage ../servers/documize-community { - inherit (darwin.apple_sdk.frameworks) Security; - }; + documize-community = callPackage ../servers/documize-community { }; doge = callPackage ../misc/doge { }; @@ -17958,9 +17791,7 @@ in helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; @@ -18586,13 +18417,9 @@ in arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + argo = callPackage ../applications/networking/cluster/argo { }; - argocd = callPackage ../applications/networking/cluster/argocd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + argocd = callPackage ../applications/networking/cluster/argocd { }; ario = callPackage ../applications/audio/ario { }; @@ -18988,9 +18815,7 @@ in csdp = callPackage ../applications/science/math/csdp { }; - ctop = callPackage ../tools/system/ctop { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ctop = callPackage ../tools/system/ctop { }; cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; @@ -19182,9 +19007,7 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; - echoip = callPackage ../servers/echoip { - inherit (darwin.apple_sdk.frameworks) Security; - }; + echoip = callPackage ../servers/echoip { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { jdk = jdk11; @@ -19336,9 +19159,7 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - exercism = callPackage ../applications/misc/exercism { - inherit (darwin.apple_sdk.frameworks) Security; - }; + exercism = callPackage ../applications/misc/exercism { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -19450,9 +19271,7 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -19493,9 +19312,7 @@ in inherit (darwin) libiconv; }; - gomuks = callPackage ../applications/networking/instant-messengers/gomuks { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -19585,9 +19402,7 @@ in sngrep = callPackage ../applications/networking/sniffers/sngrep {}; - termshark = callPackage ../tools/networking/termshark { - inherit (darwin.apple_sdk.frameworks) Security; - }; + termshark = callPackage ../tools/networking/termshark { }; fbida = callPackage ../applications/graphics/fbida { }; @@ -19818,9 +19633,7 @@ in inherit (darwin) IOKit; }; - glow = callPackage ../applications/editors/glow { - inherit (darwin.apple_sdk.frameworks) Security; - }; + glow = callPackage ../applications/editors/glow { }; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; @@ -20000,15 +19813,11 @@ in wxGTK = wxGTK30; }; - hugo = callPackage ../applications/misc/hugo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hugo = callPackage ../applications/misc/hugo { }; hydrogen = callPackage ../applications/audio/hydrogen { }; - hydroxide = callPackage ../applications/networking/hydroxide { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hydroxide = callPackage ../applications/networking/hydroxide { }; hyper = callPackage ../applications/misc/hyper { }; @@ -20350,9 +20159,7 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; @@ -20413,9 +20220,7 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; - kubeval = callPackage ../applications/networking/cluster/kubeval { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; @@ -20423,29 +20228,19 @@ in go = buildPackages.go_1_13; }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; - k9s = callPackage ../applications/networking/cluster/k9s { - inherit (darwin.apple_sdk.frameworks) Security; - }; + k9s = callPackage ../applications/networking/cluster/k9s { }; - fluxctl = callPackage ../applications/networking/cluster/fluxctl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + linkerd = callPackage ../applications/networking/cluster/linkerd { }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; @@ -20742,9 +20537,7 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; minikube = callPackage ../applications/networking/cluster/minikube { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit; + inherit (darwin.apple_sdk.frameworks) vmnet; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -21036,9 +20829,7 @@ in ptex = callPackage ../development/libraries/ptex {}; - qbec = callPackage ../applications/networking/cluster/qbec { - inherit (darwin.apple_sdk.frameworks) Security; - }; + qbec = callPackage ../applications/networking/cluster/qbec { }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; @@ -21824,9 +21615,7 @@ in sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { - inherit (darwin.apple_sdk.frameworks) Security; - }; + shadowfox = callPackage ../tools/networking/shadowfox { }; shfmt = callPackage ../tools/text/shfmt { }; @@ -21858,9 +21647,7 @@ in sooperlooper = callPackage ../applications/audio/sooperlooper { }; - sops = callPackage ../tools/security/sops { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + sops = callPackage ../tools/security/sops { }; sorcer = callPackage ../applications/audio/sorcer { }; @@ -22115,10 +21902,7 @@ in syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - }) + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-cli syncthing-discovery @@ -22205,7 +21989,6 @@ in tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -23218,7 +23001,7 @@ in freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; ledger_agent = with python3Packages; toPythonApplication ledger_agent; @@ -23232,7 +23015,6 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; monero = callPackage ../applications/blockchains/monero { @@ -25224,9 +25006,7 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { - inherit (darwin.apple_sdk.frameworks) Security; - }; + atlantis = callPackage ../applications/networking/cluster/atlantis { }; auctex = callPackage ../tools/typesetting/tex/auctex { }; @@ -25414,9 +25194,7 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gobuster = callPackage ../tools/security/gobuster { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gobuster = callPackage ../tools/security/gobuster { }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -25430,9 +25208,7 @@ in stdenv = gcc8Stdenv; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { - inherit (darwin.apple_sdk.frameworks) Security; - }; + helmfile = callPackage ../applications/networking/cluster/helmfile { }; heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; @@ -25537,9 +25313,7 @@ in musly = callPackage ../applications/audio/musly { }; - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; @@ -26006,15 +25780,12 @@ in sqsh = callPackage ../development/tools/sqsh { }; - jx = callPackage ../applications/networking/cluster/jx { - inherit (darwin.apple_sdk.frameworks) Security; - }; + jx = callPackage ../applications/networking/cluster/jx {}; prow = callPackage ../applications/networking/cluster/prow { # Version 2019-08-14 fails to build with go 1.13 due to dependencies: # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; inherit (callPackage ../applications/networking/cluster/terraform { @@ -26032,9 +25803,7 @@ in terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - inherit (darwin.apple_sdk.frameworks) Security; - } + callPackage ../applications/networking/cluster/terraform-providers {} ); terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; @@ -26154,9 +25923,7 @@ in webfs = callPackage ../servers/http/webfs { }; - websocketd = callPackage ../applications/networking/websocketd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + websocketd = callPackage ../applications/networking/websocketd { }; wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; @@ -26376,9 +26143,7 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { - inherit (darwin.apple_sdk.frameworks) Security; - }; + wtf = callPackage ../applications/misc/wtf { }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -26544,23 +26309,17 @@ in sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gortr = callPackage ../servers/gortr {}; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kcli = callPackage ../development/tools/kcli {}; unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - go-license-detector = callPackage ../development/tools/misc/go-license-detector { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { };