Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-08-26 12:01:09 +00:00 committed by GitHub
commit b13b005f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
204 changed files with 645 additions and 568 deletions

View File

@ -542,7 +542,7 @@ while read -u 3 mountPoint; do
# If copytoram is enabled: skip mounting the ISO and copy its content to a tmpfs.
if [ -n "$copytoram" ] && [ "$device" = /dev/root ] && [ "$mountPoint" = /iso ]; then
fsType=$(blkid -o value -s TYPE "$device")
fsSize=$(blockdev --getsize64 "$device")
fsSize=$(blockdev --getsize64 "$device" || stat -Lc '%s' "$device")
mkdir -p /tmp-iso
mount -t "$fsType" /dev/root /tmp-iso

View File

@ -9,17 +9,17 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.7";
version = "1.10.8";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk=";
sha256 = "sha256-r4ifLa4CMZvp0MaCkxWo5rWLEnFdX//mYlC08hndXhQ=";
};
runVend = true;
vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM=";
vendorSha256 = "sha256-e8aKQMVEEf0BzpdljkOBxznj5P1Go/6EbY9mdhDLyrw=";
doCheck = false;

View File

@ -15,7 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ];
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
meta = with lib; {
description = "Render markdown on the CLI, with pizzazz!";

View File

@ -17,7 +17,7 @@ buildGoModule rec {
vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s=";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ];
ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ];
postInstall = ''
installManPage assets/packaging/micro.1

View File

@ -20,7 +20,7 @@ in buildGoModule {
sha256 = sha256;
};
buildFlagsArray = "-ldflags=-X main.version=${humioCtlVersion}";
ldflags = [ "-X main.version=${humioCtlVersion}" ];
nativeBuildInputs = [ installShellFiles ];

View File

@ -16,7 +16,7 @@ buildGoModule rec {
vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ];
doCheck = false;

View File

@ -15,7 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ];
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
meta = with lib; {
description = "Manage your charm account on the CLI";

View File

@ -24,11 +24,11 @@ buildGoModule rec {
# The other variables are set so that the output of dstask version shows the
# git ref and the release version from github.
# Ref <https://github.com/NixOS/nixpkgs/pull/87383#discussion_r432097657>
buildFlagsArray = [ ''
-ldflags=-w -s
-X "github.com/naggie/dstask.VERSION=${version}"
-X "github.com/naggie/dstask.GIT_COMMIT=v${version}"
'' ];
ldflags = [
"-w" "-s"
"-X github.com/naggie/dstask.VERSION=${version}"
"-X github.com/naggie/dstask.GIT_COMMIT=v${version}"
];
subPackages = [ "cmd/dstask.go" ];

View File

@ -23,8 +23,8 @@ buildGoModule rec {
buildInputs = [ sqlite ];
buildFlagsArray = [
"-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}"
ldflags = [
"-s" "-w" "-X github.com/manojkarthick/expenses/cmd.Version=${version}"
];
meta = with lib; {

View File

@ -21,7 +21,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
subPackages = [ "." ];

View File

@ -15,7 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = "-ldflags=-X main.Version=${version}";
ldflags = [ "-X main.Version=${version}" ];
meta = with lib; {
description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)";

View File

@ -22,11 +22,10 @@ buildGoModule rec {
packr
'';
buildFlagsArray =
ldflags =
let package_url = "github.com/argoproj/argo-cd/v2/common"; in
[
"-ldflags="
"-s -w"
"-s" "-w"
"-X ${package_url}.version=${version}"
"-X ${package_url}.buildDate=unknown"
"-X ${package_url}.gitCommit=${commit}"

View File

@ -25,8 +25,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
buildFlagsArray = [
"-ldflags="
ldflags = [
"-s"
"-w"
"-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01"

View File

@ -28,7 +28,7 @@ buildGoModule rec {
subPackages = [ "cmd/flux" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

View File

@ -19,7 +19,7 @@ buildGoModule rec {
subPackages = [ "cmd/fluxctl" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
postInstall = ''
for shell in bash fish zsh; do

View File

@ -19,7 +19,7 @@ buildGoModule rec {
subPackages = [ "." ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ];
ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ];
postInstall = ''
wrapProgram $out/bin/helmfile \

View File

@ -22,10 +22,9 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = ''
-ldflags=
-X github.com/xetys/hetzner-kube/cmd.version=${version}
'';
ldflags = [
"-X github.com/xetys/hetzner-kube/cmd.version=${version}"
];
nativeBuildInputs = [
installShellFiles

View File

@ -17,14 +17,14 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
# Bundle release metadata
buildFlagsArray = let
ldflags = let
attrs = [
"istio.io/pkg/version.buildVersion=${version}"
"istio.io/pkg/version.buildStatus=Nix"
"istio.io/pkg/version.buildTag=${version}"
"istio.io/pkg/version.buildHub=docker.io/istio"
];
in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"];
in ["-s" "-w" "${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"];
subPackages = [ "istioctl/cmd/istioctl" ];

View File

@ -19,13 +19,12 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/jenkins-x/jx/pkg/version.Version=${version}
-X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev}
-X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean
'';
ldflags = [
"-s -w"
"-X github.com/jenkins-x/jx/pkg/version.Version=${version}"
"-X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev}"
"-X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean"
];
postInstall = ''
for shell in bash zsh; do

View File

@ -11,12 +11,11 @@ buildGoModule rec {
sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q=";
};
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/derailed/k9s/cmd.version=${version}
-X github.com/derailed/k9s/cmd.commit=${src.rev}
'';
ldflags = [
"-s" "-w"
"-X github.com/derailed/k9s/cmd.version=${version}"
"-X github.com/derailed/k9s/cmd.commit=${src.rev}"
];
vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8=";

View File

@ -15,7 +15,7 @@ buildGoModule rec {
subPackages = [ "." ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/GoogleContainerTools/kpt/run.version=${version}" ];
ldflags = [ "-s" "-w" "-X github.com/GoogleContainerTools/kpt/run.version=${version}" ];
meta = with lib; {
description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files";

View File

@ -13,11 +13,10 @@ buildGoModule rec {
vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM=";
buildFlagsArray = ''
-ldflags=
-X main.version=${version}
-X main.goVersion=${lib.getVersion go}
'';
ldflags = [
"-X main.version=${version}"
"-X main.goVersion=${lib.getVersion go}"
];
meta = with lib; {
description = "A Kubernetes credential plugin implementing Azure authentication";

View File

@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/kubeseal" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
meta = with lib; {
description = "A Kubernetes controller and tool for one-way encrypted Secrets";

View File

@ -16,10 +16,10 @@ buildGoModule rec {
subPackages = [ "cmd/kubectl-kuttl" ];
buildFlagsArray = ''
-ldflags=-s -w
-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}
'';
ldflags = [
"-s" "-w"
"-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}"
];
meta = with lib; {
description = "The KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators";

View File

@ -11,11 +11,11 @@ buildGoModule rec {
sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs=";
};
buildFlagsArray = let
ldflags = let
multus = "gopkg.in/intel/multus-cni.v3/pkg/multus";
commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7";
in [
"-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'"
"-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}"
];
preInstall = ''

View File

@ -11,12 +11,11 @@ buildGoModule rec {
sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c=";
};
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/derailed/popeye/cmd.version=${version}
-X github.com/derailed/popeye/cmd.commit=${version}
'';
ldflags = [
"-s" "-w"
"-X github.com/derailed/popeye/cmd.version=${version}"
"-X github.com/derailed/popeye/cmd.commit=${version}"
];
vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8=";

View File

@ -15,13 +15,12 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/splunk/qbec/internal/commands.version=${version}
-X github.com/splunk/qbec/internal/commands.commit=${src.rev}
-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}
'';
ldflags = [
"-s" "-w"
"-X github.com/splunk/qbec/internal/commands.version=${version}"
"-X github.com/splunk/qbec/internal/commands.commit=${src.rev}"
"-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}"
];
meta = with lib; {
description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";

View File

@ -7,14 +7,14 @@ buildGoModule rec {
pname = "sonobuoy";
version = "0.53.2"; # Do not forget to update `rev` above
buildFlagsArray =
ldflags =
let t = "github.com/vmware-tanzu/sonobuoy";
in ''
-ldflags=
-s -X ${t}/pkg/buildinfo.Version=v${version}
-X ${t}/pkg/buildinfo.GitSHA=${rev}
-X ${t}/pkg/buildDate=unknown
'';
in [
"-s"
"-X ${t}/pkg/buildinfo.Version=v${version}"
"-X ${t}/pkg/buildinfo.GitSHA=${rev}"
"-X ${t}/pkg/buildDate=unknown"
];
src = fetchFromGitHub {
sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY=";

View File

@ -19,8 +19,8 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
buildFlagsArray =
[ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ];
ldflags =
[ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ];
postInstall =
let stern = if isCrossBuild then buildPackages.stern else "$out";

View File

@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/tk" ];
buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ];
ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ];
nativeBuildInputs = [ installShellFiles ];

View File

@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/tilt" ];
buildFlagsArray = [ "-ldflags=-X main.version=${version}" ];
ldflags = [ "-X main.version=${version}" ];
meta = with lib; {
description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production";

View File

@ -14,13 +14,12 @@ buildGoModule rec {
sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk=";
};
buildFlagsArray = ''
-ldflags=
-s -w
-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean
'';
ldflags = [
"-s" "-w"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
];
vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU=";

View File

@ -15,7 +15,7 @@ buildGoModule rec {
subPackages = [ "." ];
buildFlagsArray = [ "-ldflags=-s -w" ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Synchronize your DNS to multiple providers from a simple DSL";

View File

@ -15,7 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; {
description = "NextDNS DNS/53 to DoH Proxy";

View File

@ -22,7 +22,7 @@ buildGoModule rec {
vendorSha256 = "18z3vwcwkyj6hcvl35qmj034237h9l18dvcbx1hxry7qdwv807c9";
buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
passthru = {
updateScript = genericUpdater {

View File

@ -16,7 +16,7 @@ buildGoModule rec {
subPackages = [ "." ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; {
description = "Quickly clone an entire org/users repositories into one directory";

View File

@ -15,10 +15,9 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}
'';
ldflags = [
"-X=main.Version=${version}"
];
postInstall = ''
install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq

View File

@ -16,12 +16,11 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = ''
-ldflags=
-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}
-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}
-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}
'';
ldflags = [
"-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}"
"-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}"
"-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}"
];
postInstall = ''
install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug"

View File

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU=";
buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ];
ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ];
subPackages = [ "cmd/git-chglog" ];
@ -24,4 +24,3 @@ buildGoModule rec {
maintainers = with maintainers; [ ldenefle ];
};
}

View File

@ -19,7 +19,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
postInstall = ''
wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}";

View File

@ -18,7 +18,7 @@ buildGoModule rec {
vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ=";
buildInputs = [ git ];
buildFlagsArray = "-ldflags=-X main.Version=${version}";
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
meta = with lib; {

View File

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620=";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ];
meta = with lib; {
homepage = "https://github.com/vishen/go-chromecast";

View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.21.2";
version = "1.22.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI=";
sha256 = "sha256-lY/kHvJBN7idFn3YUEHMR4w+M3F89RKMsvvyHmH/EPc=";
};
vendorSha256 = null;

View File

@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
version = "0.21";
version = "1.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
sha256 = "sha256-PhhaCXtWsknMsEt1F9jMfEWSl+OLQ/C/iTj7t0XuAFw=";
sha256 = "sha256-xpNwhNAbcTKkXl5i4L8aayMAx8O8SWdFlgHguHNiqqw=";
fetchSubmodules = true;
};

View File

@ -11,8 +11,8 @@ buildGoModule rec {
sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k";
};
buildFlagsArray = [
"-ldflags=-X github.com/containerd/containerd/version.Version=${version}"
ldflags = [
"-X github.com/containerd/containerd/version.Version=${version}"
];
vendorSha256 = null;

View File

@ -16,7 +16,7 @@ buildGoModule rec {
};
vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
buildFlagsArray = [ "-ldflags=" "-s -w" ];
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''

View File

@ -99,51 +99,6 @@ rec {
writeBashBin = name:
writeBash "/bin/${name}";
# writeC writes an executable c package called `name` to `destination` using `libraries`.
#
# Examples:
# writeC "hello-world-ncurses" { libraries = [ pkgs.ncurses ]; } ''
# #include <ncurses.h>
# int main() {
# initscr();
# printw("Hello World !!!");
# refresh(); endwin();
# return 0;
# }
# ''
writeC = name: {
libraries ? [],
strip ? true
}:
makeBinWriter {
compileScript = ''
PATH=${makeBinPath [
pkgs.binutils-unwrapped
pkgs.coreutils
pkgs.findutils
pkgs.gcc
pkgs.pkg-config
]}
export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries}
gcc \
${optionalString (libraries != [])
"$(pkg-config --cflags --libs ${
concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries
})"
} \
-O \
-o "$out" \
-Wall \
-x c \
"$contentPath"
'';
inherit strip;
} name;
# writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin)
writeCBin = name:
writeC "/bin/${name}";
# Like writeScript but the first line is a shebang to dash
#
# Example:

View File

@ -17,14 +17,6 @@ let
if [[ "test" == "test" ]]; then echo "success"; fi
'';
c = writeCBin "test-writers-c" { libraries = [ ]; } ''
#include <stdio.h>
int main() {
printf("success\n");
return 0;
}
'';
dash = writeDashBin "test-writers-dash-bin" ''
test '~' = '~' && echo 'success'
'';
@ -88,24 +80,6 @@ let
if [[ "test" == "test" ]]; then echo "success"; fi
'';
c = writeC "test-writers-c" { libraries = [ glib.dev ]; } ''
#include <gio/gio.h>
#include <stdio.h>
int main() {
GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE);
g_application_register (application, NULL, NULL);
GNotification *notification = g_notification_new ("Hello world!");
g_notification_set_body (notification, "This is an example notification.");
GIcon *icon = g_themed_icon_new ("dialog-information");
g_notification_set_icon (notification, icon);
g_object_unref (icon);
g_object_unref (notification);
g_object_unref (application);
printf("success\n");
return 0;
}
'';
dash = writeDash "test-writers-dash" ''
test '~' = '~' && echo 'success'
'';

View File

@ -1,36 +1,66 @@
{ lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }:
let
# FStar requires sedlex < 2.4
# see https://github.com/FStarLang/FStar/issues/2343
sedlex-2_3 = ocamlPackages.sedlex_2.overrideAttrs (_: rec {
pname = "sedlex";
version = "2.3";
src = fetchFromGitHub {
owner = "ocaml-community";
repo = "sedlex";
rev = "v${version}";
sha256 = "WXUXUuIaBUrFPQOKtZ7dgDZYdpEVnoJck0dkrCi8g0c=";
};
});
in
stdenv.mkDerivation rec {
pname = "fstar";
version = "0.9.6.0";
version = "2021.07.31";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "v${version}";
sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb";
sha256 = "KZTmphpt8nYpOd8EReAZ6iIkS4uY3ZziKQ3A70BL/90=";
};
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = with ocamlPackages; [
z3 ocaml findlib batteries menhir menhirLib stdint
zarith camlp4 yojson pprint
ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild
];
buildInputs = [
z3
] ++ (with ocamlPackages; [
ocaml
findlib
ocamlbuild
batteries
zarith
stdint
yojson
fileutils
menhir
menhirLib
pprint
sedlex-2_3
ppxlib
ppx_deriving
ppx_deriving_yojson
process
]);
makeFlags = [ "PREFIX=$(out)" ];
preBuild = ''
patchShebangs src/tools
patchShebangs bin
buildFlags = [ "libs" ];
postPatch = ''
patchShebangs ulib/gen_mllib.sh
substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}'
'';
buildFlags = [ "-C" "src/ocaml-output" ];
preInstall = ''
mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib
'';
installFlags = [ "-C" "src/ocaml-output" ];
postInstall = ''
wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
installShellCompletion --bash .completion/bash/fstar.exe.bash

View File

@ -19,8 +19,8 @@ let
doCheck = false;
buildFlagsArray = [
"-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown"
ldflags = [
"-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
meta = with lib; {

View File

@ -46,8 +46,9 @@
# Not needed with buildGoModule
, goPackagePath ? ""
# needed for buildFlags warning
# needed for buildFlags{,Array} warning
, buildFlags ? ""
, buildFlagsArray ? ""
, ... }@args':
@ -271,6 +272,6 @@ let
};
});
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

View File

@ -1,20 +1,23 @@
{ lib, fetchzip, buildDunePackage, ocaml }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
buildDunePackage rec {
pname = "integers";
version = "0.4.0";
version = "0.5.1";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
src = fetchFromGitHub {
owner = "ocamllabs";
repo = "ocaml-integers";
rev = version;
sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi";
};
meta = {
description = "Various signed and unsigned integer types for OCaml";
license = lib.licenses.mit;
homepage = "https://github.com/ocamllabs/ocaml-integers";
changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md";
maintainers = [ lib.maintainers.vbgl ];
};
}

View File

@ -13,7 +13,7 @@
buildDunePackage rec {
pname = "ppx_cstubs";
version = "0.6.1.1";
version = "0.6.1.2";
useDune2 = true;
@ -21,7 +21,7 @@ buildDunePackage rec {
owner = "fdopen";
repo = "ppx_cstubs";
rev = version;
sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh";
sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w";
};
buildInputs = [
@ -37,8 +37,9 @@ buildDunePackage rec {
meta = with lib; {
homepage = "https://github.com/fdopen/ppx_cstubs";
changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
description = "Preprocessor for easier stub generation with ocaml-ctypes";
license = licenses.mit;
license = licenses.lgpl21Plus;
maintainers = [ maintainers.osener ];
};
}

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "awesomeversion";
version = "21.8.0";
version = "21.8.1";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-j5y3f6F+8PzOPxpBHE3LKF3kdRzP4d21N/1Bd6v+MQg=";
sha256 = "sha256-eyo0dzmExJ7WCRAXFvB+ElWi5HTTzJ7XJsmxB2t6yfI=";
};
postPatch = ''

View File

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "1.8.0";
version = "1.8.2";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777";
sha256 = "7969d55e9ed07f6cf7dfd72ed696a05abe56a2f35e81a1ef677f3694b2adf606";
};
# needs packages which are not available in nixpkgs

View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "cfgv";
version = "3.3.0";
version = "3.3.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1";
sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736";
};
propagatedBuildInputs = [ six ];

View File

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "django-q";
version = "1.3.8";
version = "1.3.9";
src = fetchPypi {
inherit pname version;
sha256 = "db30266fadd6ab9336a8824291910ff1d1c28f7bc9d6e52cdaf33cc275ae6146";
sha256 = "5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b";
};
propagatedBuildInputs = [

View File

@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
version = "7.13.1";
version = "7.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "d6bcca0b2e5665d08e6fe6fadc2d4d321affd76ce483603078fc9d3ccd2bc0f9";
sha256 = "f3ab1454e646170bbc6796b8707e4bff125234391d2acc022221e1c0313becb4";
};
# Check is disabled because running them destroy the content of the local cluster!

View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }:
{ lib, buildPythonPackage, fetchPypi, google-api-core }:
buildPythonPackage rec {
pname = "google-cloud-access-context-manager";
@ -24,7 +24,7 @@ buildPythonPackage rec {
];
meta = with lib; {
description = "Protobufs for Google Access Context Manager.";
description = "Protobufs for Google Access Context Manager";
homepage = "https://github.com/googleapis/python-access-context-manager";
license = licenses.asl20;
maintainers = with maintainers; [ austinbutler SuperSandro2000 ];

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.16.0";
version = "1.16.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6kh9FzMW5davxN8jNFFUh+PGSNAW7w8aeoJP25mGY10=";
sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74=";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "jq";
version = "1.1.3";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r";
sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc";
};
patches = [

View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "jwcrypto";
version = "0.9.1";
version = "1.0";
src = fetchPypi {
inherit pname version;
sha256 = "63531529218ba9869e14ef8c9e7b516865ede3facf9b0ef3d3ba68014da211f9";
sha256 = "f88816eb0a41b8f006af978ced5f171f33782525006cdb055b536a40f4d46ac9";
};
propagatedBuildInputs = [

View File

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "mecab-python3";
version = "1.0.3";
version = "1.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "62abe28a1155398325372291483608427bc82681fef80e7d132904415f9fd42e";
sha256 = "b150ad5fe4260539b4ef184657e552ef81307fbbe60ae1f258bc814549ea90f8";
};
nativeBuildInputs = [

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
version = "1.12.0";
version = "1.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "5cc93f09523c703d4e00a901cf719ade4faf2c3d14961ba52060ae78d5b25327";
sha256 = "1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d";
};
propagatedBuildInputs = [

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "nbsphinx";
version = "0.8.6";
version = "0.8.7";
src = fetchPypi {
inherit pname version;
sha256 = "097dee333558f400e9abbb53ce7d4fa64a257cfa89dd20f7554dca7f0cd5e143";
sha256 = "ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c";
};
propagatedBuildInputs = [

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pdftotext";
version = "2.1.6";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "caf8ddbaeaf0a5897f07655a71747242addab2e695e84c5d47f2ea92dfe2a594";
sha256 = "efbbfb14cf37ed7ab2c71936bae44707dfed6bb3be7ea5214e9c44c8c258c7af";
};
buildInputs = [ poppler ];

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "perfplot";
version = "0.9.6";
version = "0.9.8";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nschloe";
repo = pname;
rev = "v${version}";
sha256 = "11f31d6xqxp04693symc2dl8890gjaycrb2a35y5xy023abwir5b";
rev = version;
sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d";
};
format = "pyproject";

View File

@ -5,12 +5,12 @@
}:
buildPythonPackage rec {
version = "1.5";
version = "1.6";
pname = "progress";
src = fetchPypi {
inherit pname version;
sha256 = "0wj3wvdgfmqj44n32wag3mzpp5fjqkkd321x67v1prxvs78yvv39";
sha256 = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd";
};
checkPhase = ''

View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
version = "3.8.2";
version = "3.8.3";
src = fetchPypi {
inherit pname version;
sha256 = "cf83c652b88b4b1535a306a9b0c2f34bf6c390cebb9553ef34369e6290fc9496";
sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518";
};
propagatedBuildInputs = [ requests ];

View File

@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
buildPythonPackage rec {
version = "1.0.0";
version = "1.0.1";
pname = "pybtex-docutils";
doCheck = false;
@ -9,7 +9,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e";
sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626";
};
meta = with lib; {

View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pymbolic";
version = "2020.1";
version = "2021.1";
src = fetchPypi {
inherit pname version;
sha256 = "ca029399f9480f6d51fbac0349fddbb42d937620deb03befa0ba94ac08895e6b";
sha256 = "67d08ef95568408901e59f79591ba41fd3f2caaecb42b7497c38fc82fd60358c";
};
postConfigure = ''

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysyncthru";
version = "0.7.7";
version = "0.7.8";
disabled = isPy27;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "nielstron";
repo = "pysyncthru";
rev = "release-${version}";
sha256 = "1449lbg9dx13p03v6fl2ap0xk5i5wrmy6amx1pl0rgz712p5jmq7";
sha256 = "17k9dhnya4304gqmkyvvf94jvikmnkf2lqairl3rfrl7w68jm3vp";
};
propagatedBuildInputs = [

View File

@ -26,11 +26,11 @@
buildPythonPackage rec {
pname = "scikit-build";
version = "0.11.1";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s";
sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe";
};
propagatedBuildInputs = [

View File

@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "sendgrid";
version = "6.8.0";
version = "6.8.1";
src = fetchFromGitHub {
owner = pname;
repo = "sendgrid-python";
rev = version;
sha256 = "sha256-PtTsFwE6+6/HzyR721Y9+qaI7gwYtYwuY+wrZpoGY2Q=";
sha256 = "sha256-rK/GouOv5RMDsn5NrCEtIz5a9wO6YATlhsRuhFuHaXY=";
};
propagatedBuildInputs = [

View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.9.1";
version = "3.10.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "sha256-IskBFccMDG03BFkERRfL7TH1Ppq8Xr9qTxCEoUEqxtk=";
sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs=";
};
propagatedBuildInputs = [

View File

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "SoMaJo";
version = "2.1.4";
version = "2.1.5";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
sha256 = "0clcndij4nd5ig7padvb9dj5hfxg6nymn9sf42bjr9ipjihcsbdq";
sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr";
};
propagatedBuildInputs = [ regex ];

View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "sounddevice";
version = "0.4.1";
version = "0.4.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b";
sha256 = "1c9b07cff59c837d258002ed806ee134ed367ef11042bd7d283d6ce407bf889c";
};
propagatedBuildInputs = [ cffi numpy portaudio ];

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "wurlitzer";
version = "2.1.0";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "0144228960a992ef46e339e8aa560600bd34cd64e018bfebad88c0dd61bd8ba5";
sha256 = "5a3ea5a13a8aac2d808864087fec87a0518bf7d9776173ab06a6bb4ade9f4d27";
};
propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ];

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "dotenv-linter";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "dotenv-linter";
repo = "dotenv-linter";
rev = "v${version}";
sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ=";
sha256 = "sha256-kBBn8Lgb3427K00Ag35Ei9oBD7L0Zp/lr0cAKqZpULo=";
};
cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM=";
cargoSha256 = "sha256-7Porqqh6lYeBCK2pAtbL9nxtORB9rqSyVdJDoy1/ZDo=";
meta = with lib; {
description = "Lightning-fast linter for .env files. Written in Rust";

View File

@ -15,7 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ];
ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ];
meta = with lib; {
description = "A user-friendly launcher for Bazel";

View File

@ -21,7 +21,7 @@ buildGoModule rec {
excludedPackages = [ "generatetables" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ];
ldflags = [ "-s" "-w" "-X main.buildVersion=${version}" "-X main.buildScmRevision=${src.rev}" ];
meta = with lib; {
description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps";

View File

@ -15,8 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [
"-ldflags="
ldflags = [
"-X github.com/magefile/mage/mage.commitHash=v${version}"
"-X github.com/magefile/mage/mage.gitTag=v${version}"
"-X github.com/magefile/mage/mage.timestamp=1970-01-01T00:00:00Z"

View File

@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/pack" ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ];
ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ];
postInstall = ''
installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash)

View File

@ -19,9 +19,9 @@ buildGoModule rec {
subPackages = [ "internal" ];
buildFlagsArray = ''
-ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version}
'';
ldflags = [
"-X github.com/coreos/butane/internal/version.Raw=v${version}"
];
postInstall = ''
mv $out/bin/{internal,butane}

View File

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80=";
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
doCheck = false;

View File

@ -15,8 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [
"-ldflags="
ldflags = [
"-s"
"-w"
"-X github.com/open-policy-agent/conftest/internal/commands.version=${version}"

View File

@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/bk" ];
buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ];
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
meta = with lib; {
description = "A command line interface for Buildkite";

View File

@ -17,10 +17,9 @@ buildGoModule rec {
subPackages = [ "fly" ];
buildFlagsArray = ''
-ldflags=
-X github.com/concourse/concourse.Version=${version}
'';
ldflags = [
"-X github.com/concourse/concourse.Version=${version}"
];
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p $out/share/{bash-completion/completions,zsh/site-functions}

View File

@ -16,8 +16,8 @@ buildGoModule rec {
subPackages = [ "cmd/cue" ];
buildFlagsArray = [
"-ldflags=-s -w -X cuelang.org/go/cmd/cue/cmd.version=${version}"
ldflags = [
"-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}"
];
meta = {

View File

@ -19,7 +19,7 @@ buildGoModule rec {
buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
meta = with lib; {
description = "A tool for exploring each layer in a docker image";

View File

@ -13,12 +13,11 @@ buildGoModule rec {
vendorSha256 = "sha256-gydhh/EMSuE/beo+A2CRDdDnQGT6DMjMwthylT339I4=";
buildFlagsArray = ''
-ldflags=
-s -w
-X main.Version=v${version}
-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}
'';
ldflags = [
"-s" "-w"
"-X main.Version=v${version}"
"-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}"
];
BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork";
preBuild = ''

View File

@ -13,7 +13,7 @@ buildGoModule rec {
vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s=";
buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}";
ldflags = [ "-s" "-w" "-X info.Version=${version}" ];
subPackages = [ "cmd/fission-cli" ];

View File

@ -15,8 +15,8 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [
"-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01"
ldflags = [
"-X main.buildVersion=${version}" "-X main.buildCommit=${version}" "-X main.buildDate=1970-01-01"
];
meta = with lib; {
@ -26,4 +26,3 @@ buildGoModule rec {
maintainers = with maintainers; [ doronbehar ];
};
}

View File

@ -11,8 +11,8 @@ buildGoModule rec {
sha256 = "sha256-l+ngvmTb9yVgQYT+OeaVd0zz/xNZeXWrjMpVkMpbQIw=";
};
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version}"
ldflags = [
"-s" "-w" "-X main.version=${version}"
];
vendorSha256 = "sha256-hn222ifKRYbASAHBJyMTCDwhykf2Jg9IqIUlK/GabJA=";

View File

@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "cmd/swagger" ];
buildFlagsArray = [ "-ldflags=-s -w -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version} -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ];
ldflags = [ "-s" "-w" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ];
meta = with lib; {
description = "Golang implementation of Swagger 2.0, representation of your RESTful API";

View File

@ -17,8 +17,8 @@ buildGoModule rec {
subPackages = [ "cmd/task" ];
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version}"
ldflags = [
"-s" "-w" "-X main.version=${version}"
];
postInstall = ''

View File

@ -19,8 +19,7 @@ buildGoModule rec {
rm net/net_test.go
'';
buildFlagsArray = [
"-ldflags="
ldflags = [
"-s"
"-w"
"-X github.com/${owner}/${pname}/v3/version.Version=${rev}"

View File

@ -17,7 +17,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ];
ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ];
meta = with lib; {
homepage = "https://github.com/securego/gosec";
@ -27,4 +27,3 @@ buildGoModule rec {
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -15,7 +15,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
subPackages = [ "." ];

View File

@ -17,7 +17,7 @@ buildGoModule rec {
doCheck = false;
buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
ldflags = [ "-s" "-w" "-X github.com/hetznercloud/cli/cli.Version=${version}" ];
postInstall = ''
for shell in bash zsh; do

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