Merge master into staging-next

Changed files
+111 -129
pkgs
applications
misc
cointop
networking
cluster
argo
kops
kube-router
kubeless
minishift
nextdns
version-management
git-lfs
virtualization
docker-slim
nvidia-container-runtime
development
go-packages
generic
tools
container-linux-config-transpiler
continuous-integration
gitlab-runner
dep
glide
kube-aws
misc
linuxkit
terraform-lsp
toxiproxy
web
nodejs
servers
tools
admin
exoscale-cli
filesystems
gcsfuse
misc
cloud-sql-proxy
dashing
gh-ost
git-town
systrayhelper
security
keycard-cli
minica
text
gucci
+1 -1
pkgs/applications/misc/cointop/default.nix
···
goPackagePath = "github.com/miguelmota/cointop";
-
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cointop.version=${version}" ];
+
ldflags = [ "-s" "-w" "-X ${goPackagePath}/cointop.version=${version}" ];
meta = with lib; {
description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";
+8 -9
pkgs/applications/networking/cluster/argo/default.nix
···
${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
'';
-
buildFlagsArray = ''
-
-ldflags=
-
-s -w
-
-X github.com/argoproj/argo-workflows/v3.buildDate=unknown
-
-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}
-
-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}
-
-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean
-
-X github.com/argoproj/argo-workflows/v3.version=${version}
-
'';
+
ldflags = [
+
"-s" "-w"
+
"-X github.com/argoproj/argo-workflows/v3.buildDate=unknown"
+
"-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}"
+
"-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}"
+
"-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean"
+
"-X github.com/argoproj/argo-workflows/v3.version=${version}"
+
];
postInstall = ''
for shell in bash zsh; do
+4 -5
pkgs/applications/networking/cluster/kops/default.nix
···
nativeBuildInputs = [ go-bindata installShellFiles ];
subPackages = [ "cmd/kops" ];
-
buildFlagsArray = ''
-
-ldflags=
-
-X k8s.io/kops.Version=${version}
-
-X k8s.io/kops.GitVersion=${version}
-
'';
+
ldflags = [
+
"-X k8s.io/kops.Version=${version}"
+
"-X k8s.io/kops.GitVersion=${version}"
+
];
preBuild = ''
(cd go/src/k8s.io/kops
+4 -7
pkgs/applications/networking/cluster/kube-router/default.nix
···
sha256 = "sha256-/VToLQexvRtcBU+k8WnGEcfLfxme/hgRnhU8723BEFU=";
};
-
buildFlagsArray = ''
-
-ldflags=
-
-X
-
${goPackagePath}/pkg/cmd.version=${version}
-
-X
-
${goPackagePath}/pkg/cmd.buildDate=Nix
-
'';
+
ldflags = [
+
"-X ${goPackagePath}/pkg/cmd.version=${version}"
+
"-X ${goPackagePath}/pkg/cmd.buildDate=Nix"
+
];
meta = with lib; {
homepage = "https://www.kube-router.io/";
+3 -3
pkgs/applications/networking/cluster/kubeless/default.nix
···
subPackages = [ "cmd/kubeless" ];
-
buildFlagsArray = ''
-
-ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version}
-
'';
+
ldflags = [
+
"-s" "-w" "-X github.com/kubeless/kubeless/pkg/version.Version=${version}"
+
];
postInstall = ''
for shell in bash; do
+5 -6
pkgs/applications/networking/cluster/minishift/default.nix
···
--replace '"runtime"' ""
'';
-
buildFlagsArray = ''
-
-ldflags=
-
-X ${goPackagePath}/pkg/version.minishiftVersion=${version}
-
-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}
-
-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}
-
'';
+
ldflags = [
+
"-X ${goPackagePath}/pkg/version.minishiftVersion=${version}"
+
"-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}"
+
"-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}"
+
];
preBuild = ''
(cd go/src/github.com/minishift/minishift
+3 -3
pkgs/applications/networking/nextdns/default.nix
···
buildGoModule rec {
pname = "nextdns";
-
version = "1.35.0";
+
version = "1.36.0";
src = fetchFromGitHub {
owner = "nextdns";
repo = "nextdns";
rev = "v${version}";
-
sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg=";
+
sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME=";
};
-
vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0=";
+
vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48=";
doCheck = false;
+1 -1
pkgs/applications/version-management/git-lfs/default.nix
···
nativeBuildInputs = [ ronn installShellFiles ];
-
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ];
+
ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ];
subPackages = [ "." ];
+4 -5
pkgs/applications/virtualization/docker-slim/default.nix
···
makeWrapper
];
-
buildFlagsArray = [
-
''-ldflags=
-
-s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version}
-
-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}
-
''
+
ldflags = [
+
"-s" "-w"
+
"-X ${goPackagePath}/pkg/version.appVersionTag=${version}"
+
"-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}"
];
# docker-slim tries to create its state dir next to the binary (inside the nix
+1 -1
pkgs/applications/virtualization/nvidia-container-runtime/default.nix
···
};
goPackagePath = "github.com/${pname}/src";
-
buildFlagsArray = [ "-ldflags=" "-s -w" ];
+
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
+4 -3
pkgs/development/go-packages/generic/default.nix
···
, CGO_ENABLED ? go.CGO_ENABLED
-
# needed for buildFlags warning
+
# needed for buildFlags{,Array} warning
, buildFlags ? ""
+
, buildFlagsArray ? ""
, meta ? {}, ... } @ args:
···
} // meta;
});
in
-
lib.warnIf (buildFlags != "")
-
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`"
+
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
+
"Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
package
+3 -4
pkgs/development/tools/container-linux-config-transpiler/default.nix
···
sha256="1w6nvgrl5qp3ci9igflk9dlk3020psv5m4f3p57f3qcx9vrcl4lw";
};
-
buildFlagsArray = ''
-
-ldflags=-X ${goPackagePath}/internal/version.Raw=v${version}
-
'';
+
ldflags = [
+
"-X ${goPackagePath}/internal/version.Raw=v${version}"
+
];
postInstall = ''
mv $out/bin/{internal,ct}
···
platforms = with platforms; unix;
};
}
-
+5 -6
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
···
goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
subPackages = [ "." ];
commonPackagePath = "${goPackagePath}/common";
-
buildFlagsArray = ''
-
-ldflags=
-
-X ${commonPackagePath}.NAME=gitlab-runner
-
-X ${commonPackagePath}.VERSION=${version}
-
-X ${commonPackagePath}.REVISION=v${version}
-
'';
+
ldflags = [
+
"-X ${commonPackagePath}.NAME=gitlab-runner"
+
"-X ${commonPackagePath}.VERSION=${version}"
+
"-X ${commonPackagePath}.REVISION=v${version}"
+
];
src = fetchFromGitLab {
owner = "gitlab-org";
+1 -1
pkgs/development/tools/dep/default.nix
···
sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd";
};
-
buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
+
ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ];
meta = with lib; {
homepage = "https://github.com/golang/dep";
+3 -4
pkgs/development/tools/glide/default.nix
···
goPackagePath = "github.com/Masterminds/glide";
-
buildFlagsArray = ''
-
-ldflags=
-
-X main.version=${version}
-
'';
+
ldflags = [
+
"-X main.version=${version}"
+
];
src = fetchFromGitHub {
rev = "v${version}";
+3 -3
pkgs/development/tools/kube-aws/default.nix
···
go generate ./core/root/config
)'';
-
buildFlagsArray = ''
-
-ldflags=-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version}
-
'';
+
ldflags = [
+
"-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version}"
+
];
meta = {
description = "Tool for deploying kubernetes on aws using coreos";
+1 -1
pkgs/development/tools/misc/linuxkit/default.nix
···
subPackages = [ "src/cmd/linuxkit" ];
-
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev} -X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ];
+
ldflags = [ "-s" "-w" "-X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev}" "-X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ];
meta = with lib; {
description = "A toolkit for building secure, portable and lean operating systems for containers";
+1 -1
pkgs/development/tools/misc/terraform-lsp/default.nix
···
goPackagePath = "github.com/juliosueiras/terraform-lsp";
-
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ];
+
ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ];
meta = with lib; {
description = "Language Server Protocol for Terraform";
+1 -1
pkgs/development/tools/toxiproxy/default.nix
···
goPackagePath = "github.com/Shopify/toxiproxy";
subPackages = ["cmd" "cli"];
-
buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}";
+
ldflags = [ "-X github.com/Shopify/toxiproxy.Version=v${version}" ];
postInstall = ''
mv $out/bin/cli $out/bin/toxiproxy-cli
+2 -2
pkgs/development/web/nodejs/v16.nix
···
in
buildNodejs {
inherit enableNpm;
-
version = "16.7.0";
-
sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs";
+
version = "16.8.0";
+
sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}
+3 -4
pkgs/servers/cayley/default.nix
···
goDeps = ./deps.nix;
-
buildFlagsArray = ''
-
-ldflags=
-
-X=main.Version=${version}
-
'';
+
ldflags = [
+
"-X=main.Version=${version}"
+
];
meta = {
homepage = "https://cayley.io/";
+2 -2
pkgs/servers/gotify/default.nix
···
# produce binaries which panic when executed and are not interesting at all
subPackages = [ "." ];
-
buildFlagsArray = [
-
"-ldflags=-X main.Version=${version} -X main.Mode=prod"
+
ldflags = [
+
"-X main.Version=${version}" "-X main.Mode=prod"
];
meta = with lib; {
+1 -1
pkgs/servers/mail/mailhog/default.nix
···
sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y";
};
-
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; {
description = "Web and API based SMTP testing";
+3 -4
pkgs/servers/mattermost/default.nix
···
goPackagePath = "github.com/mattermost/mattermost-server";
-
buildFlagsArray = ''
-
-ldflags=
-
-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
-
'';
+
ldflags = [
+
"-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}"
+
];
};
+8 -9
pkgs/servers/monitoring/prometheus/alertmanager.nix
···
sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41";
};
-
buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
-
-ldflags=
-
-X ${t}.Version=${version}
-
-X ${t}.Revision=${src.rev}
-
-X ${t}.Branch=unknown
-
-X ${t}.BuildUser=nix@nixpkgs
-
-X ${t}.BuildDate=unknown
-
-X ${t}.GoVersion=${lib.getVersion go}
-
'';
+
ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [
+
"-X ${t}.Version=${version}"
+
"-X ${t}.Revision=${src.rev}"
+
"-X ${t}.Branch=unknown"
+
"-X ${t}.BuildUser=nix@nixpkgs"
+
"-X ${t}.BuildDate=unknown"
+
"-X ${t}.GoVersion=${lib.getVersion go}"
+
];
nativeBuildInputs = [ installShellFiles ];
+2 -2
pkgs/servers/monitoring/prometheus/nginx-exporter.nix
···
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
-
buildFlagsArray = [
-
"-ldflags=" "-X main.version=${version}"
+
ldflags = [
+
"-X main.version=${version}"
];
src = fetchFromGitHub {
+5 -6
pkgs/servers/monitoring/prometheus/openldap-exporter.nix
···
sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4=";
};
-
buildFlagsArray = ''
-
-ldflags=
-
-s -w
-
-X github.com/tomcz/openldap_exporter.tag=v${version}
-
-X github.com/tomcz/openldap_exporter.commit=unknown
-
'';
+
ldflags = [
+
"-s" "-w"
+
"-X github.com/tomcz/openldap_exporter.tag=v${version}"
+
"-X github.com/tomcz/openldap_exporter.commit=unknown"
+
];
goPackagePath = "github.com/tomcz/openldap_exporter";
+8 -9
pkgs/servers/monitoring/prometheus/pushgateway.nix
···
buildUser = "nix@nixpkgs";
buildDate = "19700101-00:00:00";
-
buildFlagsArray = ''
-
-ldflags=
-
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}
-
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}
-
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}
-
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}
-
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}
-
-X main.goVersion=${lib.getVersion go}
-
'';
+
ldflags = [
+
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}"
+
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}"
+
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}"
+
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}"
+
"-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}"
+
"-X main.goVersion=${lib.getVersion go}"
+
];
doInstallCheck = true;
installCheckPhase = ''
+1 -1
pkgs/servers/tegola/default.nix
···
sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ=";
};
-
buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];
+
ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ];
excludedPackages = [ "example" ];
+1 -1
pkgs/tools/admin/exoscale-cli/default.nix
···
goPackagePath = "github.com/exoscale/cli";
-
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ];
+
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];
# ensures only the cli binary is built and we don't clutter bin/ with submodules
subPackages = [ "." ];
+1 -1
pkgs/tools/filesystems/gcsfuse/default.nix
···
ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse
'';
-
buildFlagsArray = [ "-ldflags=-s -w -X main.gcsfuseVersion=${version}" ];
+
ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];
meta = with lib;{
description = "A user-space file system for interacting with Google Cloud Storage";
+1 -1
pkgs/tools/misc/cloud-sql-proxy/default.nix
···
goDeps = ./deps.nix;
-
buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ];
+
ldflags = [ "-X main.versionString=${version}" ];
meta = with lib; {
description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
+1 -1
pkgs/tools/misc/dashing/default.nix
···
goDeps = ./deps.nix;
-
buildFlagsArray = [ "-ldflags=-X main.version=${version}" ];
+
ldflags = [ "-X main.version=${version}" ];
meta = with lib; {
description = "A Dash Generator Script for Any HTML";
+1 -1
pkgs/tools/misc/gh-ost/default.nix
···
goPackagePath = "github.com/github/gh-ost";
-
buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ];
+
ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ];
meta = with lib; {
description = "Triggerless online schema migration solution for MySQL";
+1 -2
pkgs/tools/misc/git-town/default.nix
···
sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8=";
};
-
buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
+
ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ];
meta = with lib; {
description = "Generic, high-level git support for git-flow workflows";
···
license = licenses.mit;
};
}
-
+7 -7
pkgs/tools/misc/systrayhelper/default.nix
···
# re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178
# > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time.
-
buildFlagsArray = [ ''-ldflags=
-
-X main.version=v${version}
-
-X main.commit=${rev}
-
-X main.date="nix-byrev"
-
-s
-
-w
-
'' ];
+
ldflags = [
+
"-X main.version=v${version}"
+
"-X main.commit=${rev}"
+
"-X main.date=nix-byrev"
+
"-s"
+
"-w"
+
];
nativeBuildInputs = [ pkg-config libappindicator-gtk3 ];
buildInputs = [ libappindicator-gtk3 ];
+1 -2
pkgs/tools/security/keycard-cli/default.nix
···
sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU=";
};
-
buildFlagsArray = [
-
"-ldflags="
+
ldflags = [
"-X main.version=${version}"
];
+3 -4
pkgs/tools/security/minica/default.nix
···
sha256 = "18518wp3dcjhf3mdkg5iwxqr3326n6jwcnqhyibphnb2a58ap7ny";
};
-
buildFlagsArray = ''
-
-ldflags=
-
-X main.BuildVersion=${version}
-
'';
+
ldflags = [
+
"-X main.BuildVersion=${version}"
+
];
meta = with lib; {
description = "A simple tool for generating self signed certificates";
+3 -4
pkgs/tools/text/gucci/default.nix
···
goDeps = ./deps.nix;
-
buildFlagsArray = ''
-
-ldflags=-X main.AppVersion=${version}
-
'';
+
ldflags = [
+
"-X main.AppVersion=${version}"
+
];
meta = with lib; {
description = "A simple CLI templating tool written in golang";
···
platforms = platforms.unix;
};
}
-