treewide: use $out instead of $bin with buildGoPackage

This commit is contained in:
zowoq 2020-04-28 11:50:57 +10:00
parent c59c4e3589
commit b5dc07a4b4
88 changed files with 153 additions and 164 deletions

View File

@ -29,8 +29,8 @@ buildGoPackage rec {
'';
installPhase = ''
mkdir -pv $bin/bin
cp -v dcrwallet $bin/bin
mkdir -pv $out/bin
cp -v dcrwallet $out/bin
'';

View File

@ -21,8 +21,8 @@ buildGoPackage rec {
'';
installPhase = ''
mkdir -pv $bin/bin
cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin
mkdir -pv $out/bin
cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin
'';
meta = with stdenv.lib; {

View File

@ -8,7 +8,7 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}"
wrapProgram "$out/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}"
'';
src = fetchFromGitHub {

View File

@ -126,8 +126,8 @@ let
installPhase = ''
pushd go/src/${goPackagePath}
mkdir -p "$bin/bin"
install -m 0755 -t "$bin/bin" ./bin/*
mkdir -p "$out/bin"
install -m 0755 -t "$out/bin" ./bin/*
popd
'';
@ -181,8 +181,8 @@ let
installPhase = ''
pushd go/src/${goPackagePath}
mkdir -p "$bin/bin"
install -m 0755 -t "$bin/bin" ./dist/artifacts/k3s
mkdir -p "$out/bin"
install -m 0755 -t "$out/bin" ./dist/artifacts/k3s
popd
'';

View File

@ -16,7 +16,7 @@ buildGoPackage rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
for shell in bash zsh; do
$bin/bin/kompose completion $shell > kompose.$shell
$out/bin/kompose completion $shell > kompose.$shell
installShellCompletion kompose.$shell
done
'';

View File

@ -34,7 +34,7 @@ let
postInstall = ''
for shell in bash zsh; do
$bin/bin/kops completion $shell > kops.$shell
$out/bin/kops completion $shell > kops.$shell
installShellCompletion kops.$shell
done
'';

View File

@ -48,7 +48,7 @@ in buildGoPackage rec {
'';
postInstall = ''
wrapProgram "$bin/bin/minishift" \
wrapProgram "$out/bin/minishift" \
--prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}'
'';

View File

@ -72,8 +72,8 @@ in buildGoPackage rec {
'';
installPhase = ''
mkdir -p $bin/bin
cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
mkdir -p $out/bin
cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
installShellCompletion --bash contrib/completions/bash/*
installShellCompletion --zsh contrib/completions/zsh/*
'';

View File

@ -20,7 +20,7 @@ buildGoPackage rec {
nativeBuildInputs = [ installShellFiles ];
postInstall =
let stern = if isCrossBuild then buildPackages.stern else "$bin"; in
let stern = if isCrossBuild then buildPackages.stern else "$out"; in
''
for shell in bash zsh; do
${stern}/bin/stern --completion $shell > stern.$shell

View File

@ -26,7 +26,7 @@ let
postInstall = ''
# remove all plugins, they are part of the main binary now
for i in $bin/bin/*; do
for i in $out/bin/*; do
if [[ $(basename $i) != terraform ]]; then
rm "$i"
fi
@ -88,7 +88,7 @@ let
buildCommand = ''
mkdir -p $out/bin/
makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \
--set NIX_TERRAFORM_PLUGIN_DIR "${
buildEnv {
name = "tf-plugin-env";

View File

@ -23,7 +23,7 @@ buildGoPackage rec {
'';
postInstall = ''
wrapProgram $bin/bin/terragrunt \
wrapProgram $out/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
'';

View File

@ -15,7 +15,7 @@ buildGoPackage rec {
subPackages = [ "." ];
outputs = [ "bin" "out" "man" ];
outputs = [ "out" "man" ];
nativeBuildInputs = [ installShellFiles ];
@ -23,7 +23,7 @@ buildGoPackage rec {
let
rcloneBin =
if stdenv.buildPlatform == stdenv.hostPlatform
then "$bin"
then "$out"
else stdenv.lib.getBin buildPackages.rclone;
in
''

View File

@ -36,7 +36,7 @@ buildGoPackage {
installPhase = ''
runHook preInstall
install -D grv $bin/bin/grv
install -D grv $out/bin/grv
runHook postInstall
'';

View File

@ -44,7 +44,7 @@ buildGoPackage rec {
)
'';
outputs = [ "bin" "out" "data" ];
outputs = [ "out" "data" ];
postInstall = ''
mkdir $data
@ -52,7 +52,7 @@ buildGoPackage rec {
mkdir -p $out
cp -R ./go/src/${goPackagePath}/options/locale $out/locale
wrapProgram $bin/bin/gitea \
wrapProgram $out/bin/gitea \
--prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
'';

View File

@ -65,7 +65,7 @@ in buildGoPackage rec {
"'/run/gitlab/shell-config.yml'"
'';
outputs = [ "bin" "out" "ruby" ];
outputs = [ "out" "ruby" ];
meta = with stdenv.lib; {
homepage = "https://gitlab.com/gitlab-org/gitaly";

View File

@ -18,8 +18,8 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = ''
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin
cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/
'';
meta = with stdenv.lib; {

View File

@ -34,13 +34,13 @@ buildGoPackage rec {
( optional sqliteSupport "sqlite"
++ optional pamSupport "pam");
outputs = [ "bin" "out" "data" ];
outputs = [ "out" "data" ];
postInstall = ''
mkdir $data
cp -R $src/{public,templates} $data
wrapProgram $bin/bin/gogs \
wrapProgram $out/bin/gogs \
--prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
'';

View File

@ -14,7 +14,7 @@ buildGoPackage rec {
};
goPackagePath = "github.com/containerd/containerd";
outputs = [ "bin" "out" "man" ];
outputs = [ "out" "man" ];
nativeBuildInputs = [ go-md2man utillinux ];
@ -33,7 +33,7 @@ buildGoPackage rec {
installPhase = ''
for b in bin/*; do
install -Dm555 $b $bin/$b
install -Dm555 $b $out/$b
done
make man

View File

@ -32,7 +32,6 @@ in buildGoPackage rec {
sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6";
};
outputs = [ "bin" "out" ];
nativeBuildInputs = [ git pkgconfig which ];
buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror
libseccomp libselinux lvm2 ]
@ -47,9 +46,9 @@ in buildGoPackage rec {
bin/pinns
'';
installPhase = ''
install -Dm755 bin/crio $bin/bin/crio${flavor}
install -Dm755 bin/crio-status $bin/bin/crio-status${flavor}
install -Dm755 bin/pinns $bin/bin/pinns${flavor}
install -Dm755 bin/crio $out/bin/crio${flavor}
install -Dm755 bin/crio-status $out/bin/crio-status${flavor}
install -Dm755 bin/pinns $out/bin/pinns${flavor}
'';
meta = with stdenv.lib; {

View File

@ -33,7 +33,7 @@ buildGoPackage rec {
# docker-slim tries to create its state dir next to the binary (inside the nix
# store), so we set it to use the working directory at the time of invocation
postInstall = ''
wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"'
wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"'
'';
meta = with stdenv.lib; {

View File

@ -16,7 +16,7 @@ buildGoPackage rec {
goDeps = null;
installPhase = ''
install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy
install -m755 -D ./go/bin/proxy $out/bin/docker-proxy
'';
meta = with stdenv.lib; {

View File

@ -25,7 +25,7 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/libpod";
outputs = [ "bin" "out" "man" ];
outputs = [ "out" "man" ];
nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];
@ -40,7 +40,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -Dm555 bin/podman $bin/bin/podman
install -Dm555 bin/podman $out/bin/podman
installShellCompletion --bash completions/bash/podman
installShellCompletion --zsh completions/zsh/_podman
MANDIR=$man/share/man make install.man

View File

@ -22,7 +22,7 @@ buildGoPackage rec {
};
goPackagePath = "github.com/opencontainers/runc";
outputs = [ "bin" "out" "man" ];
outputs = [ "out" "man" ];
nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
buildInputs = [ libseccomp libapparmor apparmor-parser ];
@ -38,7 +38,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -Dm755 runc $bin/bin/runc
install -Dm755 runc $out/bin/runc
installManPage man/*/*
'';

View File

@ -42,7 +42,7 @@ buildGoPackage rec {
patchShebangs .
sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
./mconfig -V ${version} -p $bin --localstatedir=/var
./mconfig -V ${version} -p $out --localstatedir=/var
# Don't install SUID binaries
sed -i 's/-m 4755/-m 755/g' builddir/Makefile
@ -54,16 +54,16 @@ buildGoPackage rec {
'';
installPhase = ''
make -C builddir install LOCALSTATEDIR=$bin/var
chmod 755 $bin/libexec/singularity/bin/starter-suid
wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
make -C builddir install LOCALSTATEDIR=$out/var
chmod 755 $out/libexec/singularity/bin/starter-suid
wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
'';
postFixup = ''
find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
# These etc scripts shouldn't have their paths patched
cp etc/actions/* $bin/etc/singularity/actions/
cp etc/actions/* $out/etc/singularity/actions/
'';
meta = with stdenv.lib; {

View File

@ -37,8 +37,6 @@ buildGoPackage rec {
goDeps = ./deps.nix;
outputs = [ "out" ];
nativeBuildInputs = [
pkgconfig
deepin-gettext-tools # build
@ -109,7 +107,7 @@ buildGoPackage rec {
installPhase = ''
make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
mv $out/share/gocode $out/share/go
remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
remove-references-to -t ${go} $out/lib/deepin-api/*
'';
postFixup = ''

View File

@ -29,8 +29,6 @@ buildGoPackage rec {
goDeps = ./deps.nix;
outputs = [ "out" ];
nativeBuildInputs = [
pkgconfig
dbus-factory

View File

@ -22,8 +22,6 @@ buildGoPackage rec {
goDeps = ./deps.nix;
outputs = [ "out" ];
nativeBuildInputs = [
pkgconfig
dbus-factory
@ -114,7 +112,7 @@ buildGoPackage rec {
installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath}
rm -rf $out/share/lightdm # this is uselesss for NixOS
remove-references-to -t ${go} $out/bin/* $out/sbin/*
remove-references-to -t ${go} $out/sbin/*
'';
postFixup = ''

View File

@ -22,7 +22,7 @@ buildGoPackage rec {
sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q";
};
outputs = [ "bin" "man" "out" ];
outputs = [ "out" "man" ];
goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];
@ -35,7 +35,7 @@ buildGoPackage rec {
buildPhase = ''
pushd go/src/${goPackagePath}
make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah
install -Dm755 buildah $out/bin/buildah
installShellCompletion --bash contrib/completions/bash/buildah
'';

View File

@ -34,7 +34,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -Dm555 out/cf "$bin/bin/cf"
install -Dm555 out/cf "$out/bin/cf"
installShellCompletion --bash "$src/ci/installers/completion/cf"
'';

View File

@ -20,8 +20,8 @@ buildGoPackage rec {
'';
postInstall = ''
mv $bin/bin/{internal,ct}
rm $bin/bin/tools
mv $out/bin/{internal,ct}
rm $out/bin/tools
'';
meta = {

View File

@ -24,10 +24,10 @@ buildGoPackage rec {
postInstall = ''
# Fix binary name
mv $bin/bin/{agent,buildkite-agent}
mv $out/bin/{agent,buildkite-agent}
# These are runtime dependencies
wrapProgram $bin/bin/buildkite-agent \
wrapProgram $out/bin/buildkite-agent \
--prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
'';

View File

@ -15,17 +15,17 @@ buildGoPackage {
postInstall = ''
${stdenv.lib.optionalString hasBootstrapScript ''
# Install bootstrap.sh
mkdir -p $bin/libexec/buildkite-agent
cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent
sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh
mkdir -p $out/libexec/buildkite-agent
cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent
sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh
''}
# Fix binary name
mv $bin/bin/{agent,buildkite-agent}
mv $out/bin/{agent,buildkite-agent}
# These are runtime dependencies
wrapProgram $bin/bin/buildkite-agent \
${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \
wrapProgram $out/bin/buildkite-agent \
${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
--prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
'';

View File

@ -35,10 +35,10 @@ buildGoPackage rec {
patches = [ ./fix-shell-path.patch ];
postInstall = ''
touch $bin/bin/hello
install -d $bin/bin/helper-images
ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz
ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz
touch $out/bin/hello
install -d $out/bin/helper-images
ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz
ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz
'';
meta = with lib; {

View File

@ -9,8 +9,8 @@ buildGoPackage rec {
subPackages = [ "client" ];
postInstall = ''
if [ -f "$bin/bin/client" ]; then
mv "$bin/bin/client" "$bin/bin/deis"
if [ -f "$out/bin/client" ]; then
mv "$out/bin/client" "$out/bin/deis"
fi
'';

View File

@ -19,7 +19,7 @@ buildGoPackage rec {
];
postFixup = ''
wrapProgram $bin/bin/dep2nix \
wrapProgram $out/bin/dep2nix \
--prefix PATH : ${nix-prefetch-scripts}/bin
'';

View File

@ -21,7 +21,7 @@ buildGoPackage rec {
postInstall = ''
export HOME=$(mktemp -d) # attempts to write to /homeless-shelter
for shell in bash fish zsh; do
$bin/bin/doctl completion $shell > doctl.$shell
$out/bin/doctl completion $shell > doctl.$shell
installShellCompletion doctl.$shell
done
'';

View File

@ -18,7 +18,7 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $bin/bin/fac \
wrapProgram $out/bin/fac \
--prefix PATH : ${git}/bin
# Install man page, not installed by default

View File

@ -17,14 +17,14 @@ buildGoPackage rec {
goDeps = ./deps.nix;
outputs = [ "bin" "out" "man" ];
outputs = [ "out" "man" ];
nativeBuildInputs = [ go-bindata gotools makeWrapper ];
preBuild = ''go generate ./...'';
postInstall = ''
wrapProgram $bin/bin/go2nix \
wrapProgram $out/bin/go2nix \
--prefix PATH : ${nix-prefetch-git}/bin \
--prefix PATH : ${git}/bin

View File

@ -25,7 +25,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = ''
mv $bin/bin/gocode $bin/bin/gocode-gomod
mv $out/bin/gocode $out/bin/gocode-gomod
'';
meta = with stdenv.lib; {

View File

@ -20,7 +20,7 @@ buildGoPackage rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
for shell in bash zsh; do
$bin/bin/kind completion $shell > kind.$shell
$out/bin/kind completion $shell > kind.$shell
installShellCompletion kind.$shell
done
'';

View File

@ -27,7 +27,7 @@ buildGoPackage rec {
postInstall = with stdenv; let
binPath = lib.makeBinPath [ mercurial git ];
in ''
wrapProgram $bin/bin/houndd --prefix PATH : ${binPath}
wrapProgram $out/bin/houndd --prefix PATH : ${binPath}
'';
meta = {

View File

@ -17,7 +17,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postFixup = ''
wrapProgram $bin/bin/out-of-tree \
wrapProgram $out/bin/out-of-tree \
--prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}"
'';

View File

@ -26,7 +26,7 @@ buildGoPackage rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
for shell in bash zsh; do
$bin/bin/skaffold completion $shell > skaffold.$shell
$out/bin/skaffold completion $shell > skaffold.$shell
installShellCompletion skaffold.$shell
done
'';

View File

@ -34,7 +34,7 @@ buildGoPackage {
inherit version;
inherit src goPackagePath;
outputs = [ "bin" "man" "out" ];
outputs = [ "out" "man" ];
excludedPackages = [ "integration" ];

View File

@ -15,8 +15,8 @@ buildGoPackage rec {
buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}";
postInstall = ''
mv $bin/bin/cli $bin/bin/toxiproxy-cli
mv $bin/bin/cmd $bin/bin/toxiproxy-cmd
mv $out/bin/cli $out/bin/toxiproxy-cli
mv $out/bin/cmd $out/bin/toxiproxy-cmd
'';
meta = {

View File

@ -28,7 +28,7 @@ buildGoPackage {
postInstall = with stdenv; let
binPath = lib.makeBinPath [ nix-prefetch-git go ];
in ''
wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath}
wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath}
'';
meta = with stdenv.lib; {

View File

@ -19,7 +19,7 @@ buildGoPackage rec {
};
postInstall = ''
mv $bin/bin/cli $bin/bin/wally
mv $out/bin/cli $out/bin/wally
'';
goDeps = ./deps.nix;

View File

@ -14,7 +14,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu";
postInstall = "mv $out/bin/boohu.git $out/bin/boohu";
meta = with stdenv.lib; {
description = "A new coffee-break roguelike game";

View File

@ -14,7 +14,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist";
postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist";
meta = with stdenv.lib; {
description = "A stealth coffee-break roguelike game";

View File

@ -47,7 +47,7 @@ in {
'';
buildInputs = [ systemd.dev ];
postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
'';
};
}

View File

@ -46,7 +46,7 @@ in {
'';
buildInputs = [ systemd.dev ];
postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
'';
};
}

View File

@ -22,8 +22,8 @@ buildGoPackage rec {
];
postInstall = ''
mkdir -p $bin/share
cp -r $src/web $bin/share/web
mkdir -p $out/share
cp -r $src/web $out/share/web
'';
meta = with lib; {

View File

@ -22,7 +22,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin
install -Dm755 bin/* bin/functional/cmd/* -t $out/bin
'';
passthru.tests = with nixosTests; {

View File

@ -35,9 +35,9 @@ buildGoPackage {
'';
installPhase = ''
mkdir -p $bin/bin $bin/share/meguca
cp meguca $bin/bin
cp -r www $bin/share/meguca
mkdir -p $out/bin $out/share/meguca
cp meguca $out/bin
cp -r www $out/share/meguca
'';
meta = with stdenv.lib; {

View File

@ -20,7 +20,7 @@ buildGoPackage rec {
'';
postInstall = ''
mv $bin/bin/miniflux.app $bin/bin/miniflux
mv $out/bin/miniflux.app $out/bin/miniflux
'';
meta = with stdenv.lib; {

View File

@ -19,7 +19,7 @@ buildGoPackage rec {
};
postInstall = ''
wrapProgram $bin/bin/grafana-reporter \
wrapProgram $out/bin/grafana-reporter \
--prefix PATH : ${makeBinPath [ tetex ]}
'';

View File

@ -29,10 +29,10 @@ buildGoPackage rec {
postInstall = ''
tar -xvf $srcStatic
mkdir -p $bin/share/grafana
mv grafana-*/{public,conf,tools} $bin/share/grafana/
mkdir -p $out/share/grafana
mv grafana-*/{public,conf,tools} $out/share/grafana/
'' + lib.optionalString phantomJsSupport ''
ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs
ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs
'';
meta = with lib; {

View File

@ -24,7 +24,7 @@ buildGoPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $bin/bin/promtail \
wrapProgram $out/bin/promtail \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
'';

View File

@ -27,7 +27,7 @@ buildGoPackage rec {
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
$bin/bin/amtool --completion-script-bash > amtool.bash
$out/bin/amtool --completion-script-bash > amtool.bash
installShellCompletion amtool.bash
'';

View File

@ -54,9 +54,9 @@ in buildGoPackage rec {
'';
preInstall = ''
mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
cp -a $src/documentation/* $bin/share/doc/prometheus
cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus"
cp -a $src/documentation/* $out/share/doc/prometheus
cp -a $src/console_libraries $src/consoles $out/etc/prometheus
'';
doCheck = true;

View File

@ -43,7 +43,7 @@ buildGoPackage rec {
];
postInstall = optionalString withSystemdSupport ''
wrapProgram $bin/bin/postfix_exporter \
wrapProgram $out/bin/postfix_exporter \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
'';

View File

@ -29,7 +29,7 @@ buildGoPackage rec {
doInstallCheck = true;
installCheckPhase = ''
export PATH=$PATH:$bin/bin
export PATH=$PATH:$out/bin
pushgateway --help

View File

@ -16,7 +16,7 @@ let
goPackagePath = "github.com/${owner}/${repo}";
inherit src;
postInstall = ''
mkdir $out
mkdir -p $out
cp go/src/github.com/sensu/uchiwa/public/index.html $out/
'';
};
@ -37,7 +37,7 @@ in stdenv.mkDerivation {
buildCommand = ''
mkdir -p $out/bin $out/public
makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \
makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \
--add-flags "-p $out/public"
ln -s ${backend.out}/index.html $out/public/index.html
ln -s ${frontend.out}/bower_components $out/public/bower_components

View File

@ -15,8 +15,8 @@ buildGoPackage rec {
};
postInstall = ''
mkdir -p $bin/share
cp -R $src/frontend $bin/share
mkdir -p $out/share
cp -R $src/frontend $out/share
'';
meta = with stdenv.lib; {

View File

@ -42,7 +42,7 @@ buildGoPackage rec {
installPhase = ''
runHook preInstall
install -D cockroachoss $bin/bin/cockroach
install -D cockroachoss $out/bin/cockroach
installShellCompletion cockroach.bash
mkdir -p $man/share/man
@ -51,11 +51,7 @@ buildGoPackage rec {
runHook postInstall
'';
# Unfortunately we have to keep an empty reference to $out, because it seems
# buildGoPackages only nukes references to the go compiler under $bin, effectively
# making all binary output under $bin mandatory. Ideally, we would just use
# $out and $man and remove $bin since there's no point in an empty path. :(
outputs = [ "bin" "man" "out" ];
outputs = [ "out" "man" ];
meta = with stdenv.lib; {
homepage = "https://www.cockroachlabs.com";

View File

@ -32,11 +32,11 @@ buildGoPackage rec {
installPhase =
if stdenv.isDarwin
then ''
install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain
install -Dm755 -t $out/bin bin/docker-credential-osxkeychain
''
else ''
install -Dm755 -t $bin/bin bin/docker-credential-pass
install -Dm755 -t $bin/bin bin/docker-credential-secretservice
install -Dm755 -t $out/bin bin/docker-credential-pass
install -Dm755 -t $out/bin bin/docker-credential-secretservice
'';
meta = with stdenv.lib; {

View File

@ -31,9 +31,9 @@ buildGoPackage rec {
postInstall = ''
# test binaries, code generation
rm $bin/bin/{deps,macaroon-identity,generate}
rm $out/bin/{deps,macaroon-identity,generate}
wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu
(writeShellScriptBin "apparmor_parser" ''
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"

View File

@ -17,7 +17,7 @@ buildGoPackage rec {
buildInputs = [ makeWrapper ];
preFixup = ''
wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin
wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin
'';
meta = with stdenv.lib; {

View File

@ -19,7 +19,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -D duplicacy_main $bin/bin/duplicacy
install -D duplicacy_main $out/bin/duplicacy
'';
meta = with lib; {

View File

@ -20,7 +20,7 @@ buildGoPackage rec {
passthru.tests.restic = nixosTests.restic;
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
$bin/bin/restic generate \
$out/bin/restic generate \
--bash-completion restic.bash \
--zsh-completion restic.zsh \
--man .

View File

@ -19,7 +19,7 @@ buildGoPackage rec {
'';
installPhase = ''
install -Dt $bin/bin rest-server
install -Dt $out/bin rest-server
'';
meta = with lib; {

View File

@ -16,8 +16,8 @@ buildGoPackage rec {
subPackages = [ "." "tools/mount_gcsfuse" ];
postInstall = ''
ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse
ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse
ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse
ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse
'';
meta = with lib;{

View File

@ -33,7 +33,7 @@ buildGoPackage {
postInstall = ''
installShellCompletion --bash ${aptlyCompletionSrc}/aptly
wrapProgram "$bin/bin/aptly" \
wrapProgram "$out/bin/aptly" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
'';

View File

@ -23,9 +23,9 @@ buildGoPackage rec {
installPhase = ''
mkdir -p $out
make install DESTDIR=$bin
mkdir -p $bin/share/fish/vendor_conf.d
echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish
make install DESTDIR=$out
mkdir -p $out/share/fish/vendor_conf.d
echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
'';
meta = with stdenv.lib; {

View File

@ -45,7 +45,7 @@ in buildGoPackage {
runHook preBuild
${stdenv.lib.concatMapStrings (t: ''
go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
'') tools}
runHook postBuild

View File

@ -15,7 +15,7 @@ buildGoPackage rec {
};
postInstall = ''
ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp
ln -s $out/bin/phraseapp-client $out/bin/phraseapp
'';
meta = with stdenv.lib; {

View File

@ -18,12 +18,12 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = ''
install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow
install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow
'';
preFixup = ''
wrapProgram $bin/bin/tewisay \
--prefix COWPATH : $bin/share/tewisay/cows
wrapProgram $out/bin/tewisay \
--prefix COWPATH : $out/share/tewisay/cows
'';
meta = {

View File

@ -10,7 +10,7 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram "$bin/bin/assh" \
wrapProgram "$out/bin/assh" \
--prefix PATH : ${openssh}/bin
'';

View File

@ -47,8 +47,8 @@ in buildGoPackage rec {
# DataDog use paths relative to the agent binary, so fix these.
postPatch = ''
sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \
-e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \
sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \
-e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \
-i cmd/agent/common/common_nix.go
sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \
-i pkg/util/hostname_nix.go
@ -57,14 +57,14 @@ in buildGoPackage rec {
# Install the config files and python modules from the "dist" dir
# into standard paths.
postInstall = ''
mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent
cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent
cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages}
mkdir -p $out/${python.sitePackages} $out/share/datadog-agent
cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent
cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent
cp -R $src/pkg/status/dist/templates $out/share/datadog-agent
wrapProgram "$bin/bin/agent" \
--set PYTHONPATH "$bin/${python.sitePackages}" \
wrapProgram "$out/bin/agent" \
--set PYTHONPATH "$out/${python.sitePackages}" \
--prefix LD_LIBRARY_PATH : ${systemd.lib}/lib
'';

View File

@ -23,14 +23,14 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = ''
mkdir -p $bin/bin $out/share/doc/${pname}
cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/
mkdir -p $out/bin $out/share/doc/${pname}
cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $out/bin/
cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent
'';
postFixup = ''
wrapProgram $bin/bin/sga-guard \
--prefix PATH : "$bin/bin" \
wrapProgram $out/bin/sga-guard \
--prefix PATH : "$out/bin" \
--prefix PATH : "${autossh}/bin"
'';

View File

@ -29,10 +29,10 @@ buildGoPackage rec {
postInstall = ''
mkdir -p $lib
cp -v $src/data/*.nix $lib
wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
'';
outputs = [ "out" "bin" "lib" ];
outputs = [ "out" "lib" ];
meta = with lib; {
description = "Morph is a NixOS host manager written in Golang.";

View File

@ -23,13 +23,13 @@ buildGoPackage rec {
postInstall = ''
for shell in bash fish zsh; do
$bin/bin/gopass completion $shell > gopass.$shell
$out/bin/gopass completion $shell > gopass.$shell
installShellCompletion gopass.$shell
done
'';
postFixup = ''
wrapProgram $bin/bin/gopass \
wrapProgram $out/bin/gopass \
--prefix PATH : "${wrapperPath}"
'';

View File

@ -26,7 +26,7 @@ buildGoPackage rec {
installPhase = ''
runHook preInstall
install -D bin/notary $bin/bin/notary
install -D bin/notary $out/bin/notary
runHook postInstall
'';

View File

@ -23,7 +23,7 @@ buildGoPackage rec {
];
postInstall = ''
echo "complete -C $bin/bin/vault vault" > vault.bash
echo "complete -C $out/bin/vault vault" > vault.bash
installShellCompletion vault.bash
'';

View File

@ -28,8 +28,8 @@ buildGoPackage rec {
'';
installPhase = ''
mkdir -p $bin/bin
cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/
mkdir -p $out/bin
cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/
'';
meta = {

View File

@ -16,7 +16,7 @@ buildGoPackage rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
"BINDIR=${placeholder "bin"}/bin"
"BINDIR=${placeholder "out"}/bin"
];
buildPhase = ''

View File

@ -14,7 +14,7 @@ buildGoPackage rec {
buildPhase = ''
pushd go/src/${goPackagePath}
make all install BINDIR=$bin/bin
make all install BINDIR=$out/bin
'';
meta = with lib; {

View File

@ -23,7 +23,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
postInstall = ''
wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath}
wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath}
'';
nativeBuildInputs = [ pkgconfig makeWrapper ];