MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-08-26 06:01:19 +00:00 committed by GitHub
commit 572dfaae2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 111 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/cointop/default.nix
View file

@ -13,7 +13,7 @@ buildGoPackage rec {
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";

17
pkgs/applications/networking/cluster/argo/default.nix
View file

@ -43,15 +43,14 @@ buildGoModule rec {
${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

9
pkgs/applications/networking/cluster/kops/default.nix
View file

@ -21,11 +21,10 @@ let
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

11
pkgs/applications/networking/cluster/kube-router/default.nix
View file

@ -13,13 +13,10 @@ buildGoPackage rec {
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/";

6
pkgs/applications/networking/cluster/kubeless/default.nix
View file

@ -17,9 +17,9 @@ buildGoPackage rec {
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

11
pkgs/applications/networking/cluster/minishift/default.nix
View file

@ -34,12 +34,11 @@ in buildGoPackage rec {
--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

6
pkgs/applications/networking/nextdns/default.nix
View file

@ -2,16 +2,16 @@
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;

2
pkgs/applications/version-management/git-lfs/default.nix
View file

@ -15,7 +15,7 @@ buildGoPackage rec {
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 = [ "." ];

9
pkgs/applications/virtualization/docker-slim/default.nix
View file

@ -23,11 +23,10 @@ buildGoPackage rec {
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

2
pkgs/applications/virtualization/nvidia-container-runtime/default.nix
View file

@ -35,7 +35,7 @@ buildGoPackage rec {
};
goPackagePath = "github.com/${pname}/src";
buildFlagsArray = [ "-ldflags=" "-s -w" ];
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''

7
pkgs/development/go-packages/generic/default.nix
View file

@ -43,8 +43,9 @@
, CGO_ENABLED ? go.CGO_ENABLED
# needed for buildFlags warning
# needed for buildFlags{,Array} warning
, buildFlags ? ""
, buildFlagsArray ? ""
, meta ? {}, ... } @ args:
@ -260,6 +261,6 @@ let
} // 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

7
pkgs/development/tools/container-linux-config-transpiler/default.nix
View file

@ -15,9 +15,9 @@ buildGoPackage rec {
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}
@ -32,4 +32,3 @@ buildGoPackage rec {
platforms = with platforms; unix;
};
}

11
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file

@ -19,12 +19,11 @@ buildGoPackage rec {
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";

2
pkgs/development/tools/dep/default.nix
View file

@ -15,7 +15,7 @@ buildGoPackage rec {
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";

7
pkgs/development/tools/glide/default.nix
View file

@ -6,10 +6,9 @@ buildGoPackage rec {
goPackagePath = "github.com/Masterminds/glide";
buildFlagsArray = ''
-ldflags=
-X main.version=${version}
'';
ldflags = [
"-X main.version=${version}"
];
src = fetchFromGitHub {
rev = "v${version}";

6
pkgs/development/tools/kube-aws/default.nix
View file

@ -22,9 +22,9 @@ buildGoPackage rec {
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";

2
pkgs/development/tools/misc/linuxkit/default.nix
View file

@ -15,7 +15,7 @@ buildGoPackage rec {
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";

2
pkgs/development/tools/misc/terraform-lsp/default.nix
View file

@ -13,7 +13,7 @@ buildGoPackage rec {
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";

2
pkgs/development/tools/toxiproxy/default.nix
View file

@ -12,7 +12,7 @@ buildGoPackage rec {
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

4
pkgs/development/web/nodejs/v16.nix
View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.7.0";
sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs";
version = "16.8.0";
sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}

7
pkgs/servers/cayley/default.nix
View file

@ -15,10 +15,9 @@ buildGoPackage rec {
goDeps = ./deps.nix;
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}
'';
ldflags = [
"-X=main.Version=${version}"
];
meta = {
homepage = "https://cayley.io/";

4
pkgs/servers/gotify/default.nix
View file

@ -45,8 +45,8 @@ buildGoModule rec {
# 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; {

2
pkgs/servers/mail/mailhog/default.nix
View file

@ -13,7 +13,7 @@ buildGoPackage rec {
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";

7
pkgs/servers/mattermost/default.nix
View file

@ -16,10 +16,9 @@ let
goPackagePath = "github.com/mattermost/mattermost-server";
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
'';
ldflags = [
"-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}"
];
};

17
pkgs/servers/monitoring/prometheus/alertmanager.nix
View file

@ -14,15 +14,14 @@ buildGoPackage rec {
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 ];

4
pkgs/servers/monitoring/prometheus/nginx-exporter.nix
View file

@ -6,8 +6,8 @@ buildGoPackage rec {
goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
buildFlagsArray = [
"-ldflags=" "-X main.version=${version}"
ldflags = [
"-X main.version=${version}"
];
src = fetchFromGitHub {

11
pkgs/servers/monitoring/prometheus/openldap-exporter.nix
View file

@ -11,12 +11,11 @@ buildGoPackage rec {
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";

17
pkgs/servers/monitoring/prometheus/pushgateway.nix
View file

@ -17,15 +17,14 @@ buildGoPackage rec {
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 = ''

2
pkgs/servers/tegola/default.nix
View file

@ -13,7 +13,7 @@ buildGoPackage rec {
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" ];

2
pkgs/tools/admin/exoscale-cli/default.nix
View file

@ -13,7 +13,7 @@ buildGoPackage rec {
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 = [ "." ];

2
pkgs/tools/filesystems/gcsfuse/default.nix
View file

@ -20,7 +20,7 @@ buildGoPackage rec {
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";

2
pkgs/tools/misc/cloud-sql-proxy/default.nix
View file

@ -16,7 +16,7 @@ buildGoPackage rec {
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";

2
pkgs/tools/misc/dashing/default.nix
View file

@ -15,7 +15,7 @@ buildGoPackage rec {
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";

2
pkgs/tools/misc/gh-ost/default.nix
View file

@ -13,7 +13,7 @@ buildGoPackage rec {
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";

3
pkgs/tools/misc/git-town/default.nix
View file

@ -12,7 +12,7 @@ buildGoPackage rec {
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";
@ -21,4 +21,3 @@ buildGoPackage rec {
license = licenses.mit;
};
}

14
pkgs/tools/misc/systrayhelper/default.nix
View file

@ -16,13 +16,13 @@ buildGoPackage rec {
# 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 ];

3
pkgs/tools/security/keycard-cli/default.nix
View file

@ -17,8 +17,7 @@ buildGoPackage rec {
sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU=";
};
buildFlagsArray = [
"-ldflags="
ldflags = [
"-X main.version=${version}"
];

7
pkgs/tools/security/minica/default.nix
View file

@ -13,10 +13,9 @@ buildGoPackage rec {
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";

7
pkgs/tools/text/gucci/default.nix
View file

@ -15,9 +15,9 @@ buildGoPackage rec {
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";
@ -27,4 +27,3 @@ buildGoPackage rec {
platforms = platforms.unix;
};
}