diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 84b146532b1..70c135555ea 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -191,18 +191,6 @@ deis = buildGoPackage rec {
To extract dependency information from a Go package in automated way use go2nix. It can produce complete derivation and goDeps file for Go programs.
-
- buildGoPackage produces where bin includes program binaries. You can test build a Go binary as follows:
-
-$ nix-build -A deis.bin
-
- or build all outputs with:
-
-$ nix-build -A deis.all
-
- bin output will be installed by default with nix-env -i or systemPackages.
-
-
You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc:
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 07f11239366..65cea9ca1c4 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -312,6 +312,11 @@ environment.systemPackages = [
the notmuch.emacs output.
+
+
+ The default output of buildGoPackage is now $out instead of $bin.
+
+
diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix
index b27e122bd1d..6ac64a81fc2 100644
--- a/nixos/modules/programs/singularity.nix
+++ b/nixos/modules/programs/singularity.nix
@@ -5,8 +5,8 @@ let
cfg = config.programs.singularity;
singularity = pkgs.singularity.overrideAttrs (attrs : {
installPhase = attrs.installPhase + ''
- mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig
- ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid
+ mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig
+ ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid
'';
});
in {
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index bd4cf6a37ba..cce4797e13f 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -127,7 +127,7 @@ in
serviceConfig = {
StateDirectory = "gitlab-runner";
ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
- ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
+ ExecStart = ''${cfg.package}/bin/gitlab-runner run \
--working-directory ${cfg.workDir} \
--config /etc/gitlab-runner/config.toml \
--service gitlab-runner \
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index 8e9bec15dd4..c1ebdb3dde9 100755
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -75,7 +75,7 @@ in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
- ExecStart = "${cfg.package.bin}/bin/confd";
+ ExecStart = "${cfg.package}/bin/confd";
};
};
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index 7322e1c080b..32360d43768 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -178,7 +178,7 @@ in {
serviceConfig = {
Type = "notify";
- ExecStart = "${pkgs.etcd.bin}/bin/etcd";
+ ExecStart = "${pkgs.etcd}/bin/etcd";
User = "etcd";
LimitNOFILE = 40000;
};
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 38910a5a005..7c8e2c75577 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -335,7 +335,7 @@ in
description = "gitea";
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
wantedBy = [ "multi-user.target" ];
- path = [ gitea.bin pkgs.gitAndTools.git ];
+ path = [ gitea pkgs.gitAndTools.git ];
preStart = let
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@@ -347,11 +347,11 @@ in
cp -f ${configFile} ${runConfig}
if [ ! -e ${secretKey} ]; then
- ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey}
+ ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
fi
if [ ! -e ${jwtSecret} ]; then
- ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}
+ ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}
fi
KEY="$(head -n1 ${secretKey})"
@@ -374,7 +374,7 @@ in
HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*")
if [ "$HOOKS" ]
then
- sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@@ -383,7 +383,7 @@ in
# update command option in authorized_keys
if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]
then
- sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
fi
'';
@@ -392,7 +392,7 @@ in
User = cfg.user;
Group = "gitea";
WorkingDirectory = cfg.stateDir;
- ExecStart = "${gitea.bin}/bin/gitea web";
+ ExecStart = "${gitea}/bin/gitea web";
Restart = "always";
# Filesystem
@@ -450,7 +450,7 @@ in
description = "gitea dump";
after = [ "gitea.service" ];
wantedBy = [ "default.target" ];
- path = [ gitea.bin ];
+ path = [ gitea ];
environment = {
USER = cfg.user;
@@ -461,7 +461,7 @@ in
serviceConfig = {
Type = "oneshot";
User = cfg.user;
- ExecStart = "${gitea.bin}/bin/gitea dump";
+ ExecStart = "${gitea}/bin/gitea dump";
WorkingDirectory = cfg.stateDir;
};
};
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
index ee99967c261..c5070aaa356 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@@ -200,7 +200,7 @@ in
description = "Gogs (Go Git Service)";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.gogs.bin ];
+ path = [ pkgs.gogs ];
preStart = let
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@@ -230,7 +230,7 @@ in
HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
if [ "$HOOKS" ]
then
- sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@@ -242,7 +242,7 @@ in
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.stateDir;
- ExecStart = "${pkgs.gogs.bin}/bin/gogs web";
+ ExecStart = "${pkgs.gogs}/bin/gogs web";
Restart = "always";
};
diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix
index d4e88ecbebd..ef89d3e64d0 100644
--- a/nixos/modules/services/misc/leaps.nix
+++ b/nixos/modules/services/misc/leaps.nix
@@ -55,7 +55,7 @@ in
Restart = "on-failure";
WorkingDirectory = stateDir;
PrivateTmp = true;
- ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";
+ ExecStart = "${pkgs.leaps}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";
};
};
};
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix
index e951a4c7ffa..f7c05deeecb 100644
--- a/nixos/modules/services/misc/ssm-agent.nix
+++ b/nixos/modules/services/misc/ssm-agent.nix
@@ -35,7 +35,7 @@ in {
path = [ fake-lsb-release ];
serviceConfig = {
- ExecStart = "${cfg.package.bin}/bin/agent";
+ ExecStart = "${cfg.package}/bin/agent";
KillMode = "process";
Restart = "on-failure";
RestartSec = "15min";
@@ -43,4 +43,3 @@ in {
};
};
}
-
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index b1c12cce1f8..04e9da1c81a 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -148,7 +148,7 @@ in {
User = cfg.user;
Group = cfg.group;
ExecStart = ''
- ${cfg.package.bin}/bin/bosun -c ${configFile}
+ ${cfg.package}/bin/bosun -c ${configFile}
'';
};
};
diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix
index b5a78e4583e..893c15d568b 100644
--- a/nixos/modules/services/monitoring/grafana-reporter.nix
+++ b/nixos/modules/services/monitoring/grafana-reporter.nix
@@ -59,7 +59,7 @@ in {
"-templates ${cfg.templateDir}"
];
in {
- ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}";
+ ExecStart = "${pkgs.grafana_reporter}/bin/grafana-reporter ${args}";
};
};
};
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 0f8bc2471e3..b0c81a46d4d 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -535,7 +535,7 @@ in {
${optionalString cfg.provision.enable ''
export GF_PATHS_PROVISIONING=${provisionConfDir};
''}
- exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}
+ exec ${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}
'';
serviceConfig = {
WorkingDirectory = cfg.dataDir;
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index 045e48a3d0f..01276366e97 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -58,7 +58,7 @@ in
in {
serviceConfig = {
ExecStart = ''
- ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
+ ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \
--config.file=${escapeShellArg configFile} \
--log.format=${escapeShellArg cfg.logFormat} \
--log.level=${cfg.logLevel} \
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 38cd2213de7..6f13ce889cb 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -118,7 +118,7 @@ in {
serviceConfig = {
User = cfg.user;
Group = cfg.group;
- ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
+ ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
};
};
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 689cbc8a986..f7d2afead06 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -179,15 +179,15 @@ in
(filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
serviceConfig = {
- ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d"
+ ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
+ concatMapStrings (n: " -config-file ${n}") configFiles;
- ExecReload = "${cfg.package.bin}/bin/consul reload";
+ ExecReload = "${cfg.package}/bin/consul reload";
PermissionsStartOnly = true;
User = if cfg.dropPrivileges then "consul" else null;
Restart = "on-failure";
TimeoutStartSec = "infinity";
} // (optionalAttrs (cfg.leaveOnStop) {
- ExecStop = "${cfg.package.bin}/bin/consul leave";
+ ExecStop = "${cfg.package}/bin/consul leave";
});
path = with pkgs; [ iproute gnugrep gawk consul ];
@@ -238,7 +238,7 @@ in
serviceConfig = {
ExecStart = ''
- ${cfg.alerts.package.bin}/bin/consul-alerts start \
+ ${cfg.alerts.package}/bin/consul-alerts start \
--alert-addr=${cfg.alerts.listenAddr} \
--consul-addr=${cfg.alerts.consulAddr} \
${optionalString cfg.alerts.watchChecks "--watch-checks"} \
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix
index dd2f6454e95..4c040112d28 100644
--- a/nixos/modules/services/networking/flannel.nix
+++ b/nixos/modules/services/networking/flannel.nix
@@ -19,8 +19,8 @@ in {
package = mkOption {
description = "Package to use for flannel";
type = types.package;
- default = pkgs.flannel.bin;
- defaultText = "pkgs.flannel.bin";
+ default = pkgs.flannel;
+ defaultText = "pkgs.flannel";
};
publicIp = mkOption {
@@ -167,7 +167,7 @@ in {
touch /run/flannel/docker
'' + optionalString (cfg.storageBackend == "etcd") ''
echo "setting network configuration"
- until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
+ until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
do
echo "setting network configuration, retry"
sleep 1
diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index 6ad18bb2240..e79d6de9264 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -83,7 +83,7 @@ in {
SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;
};
serviceConfig = {
- ExecStart = "${cfg.package.bin}/bin/skydns";
+ ExecStart = "${cfg.package}/bin/skydns";
};
};
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index a5087b0a99b..e37334b3cf5 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -43,12 +43,12 @@ in {
description = "Provide EC2 instance credentials to machines outside of EC2";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ];
+ requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ];
preStart = ''
/run/current-system/sw/bin/rm -fv /run/hologram.sock
'';
serviceConfig = {
- ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
+ ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
};
};
diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index bad02c7440b..4acf6ae0e21 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -123,7 +123,7 @@ in {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
+ ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
};
};
};
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 46caadee204..d5c5437329e 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -577,7 +577,7 @@ in
serviceConfig = {
User = "oauth2_proxy";
Restart = "always";
- ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}";
+ ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}";
EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile;
};
};
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 853347bf86e..f5c2c356afc 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -224,7 +224,7 @@ in
serviceConfig = {
User = "nobody";
Group = "nogroup";
- ExecStart = "${pkgs.matterircd.bin}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}";
+ ExecStart = "${pkgs.matterircd}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}";
WorkingDirectory = "/tmp";
PrivateTmp = true;
Restart = "always";
diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix
index fc51b159579..93fefe56d1a 100644
--- a/nixos/modules/virtualisation/ecs-agent.nix
+++ b/nixos/modules/virtualisation/ecs-agent.nix
@@ -38,9 +38,8 @@ in {
if [ ! -z "$ECS_DATADIR" ]; then
mkdir -p "$ECS_DATADIR"
fi
- ${cfg.package.bin}/bin/agent
+ ${cfg.package}/bin/agent
'';
};
};
}
-
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index de48d3a780e..53b89a9f55b 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -108,7 +108,7 @@ in
'';
serviceConfig = {
- ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd";
+ ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd";
Type = "simple";
KillMode = "process"; # when stopping, leave the containers alone
LimitMEMLOCK = "infinity";
diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix
index 41d50dc7308..35f879840dd 100644
--- a/nixos/modules/virtualisation/podman.nix
+++ b/nixos/modules/virtualisation/podman.nix
@@ -6,13 +6,11 @@ let
# Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" {
- outputs = [ "out" "bin" "man" ];
+ outputs = [ "out" "man" ];
inherit (pkgs.podman) meta;
} ''
- mkdir $out
-
- mkdir -p $bin/bin
- ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker
+ mkdir -p $out/bin
+ ln -s ${pkgs.podman}/bin/podman $out/bin/docker
mkdir -p $man/share/man/man1
for f in ${pkgs.podman.man}/share/man/man1/*; do
diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix
index 163ed2615d3..258aad8e1bd 100644
--- a/pkgs/applications/blockchains/dcrwallet.nix
+++ b/pkgs/applications/blockchains/dcrwallet.nix
@@ -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
'';
diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
index 49bc0be108f..f745860f661 100644
--- a/pkgs/applications/blockchains/quorum.nix
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -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; {
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
index 7603a66cd36..29dc6f54e6c 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -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 {
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index b18e1f08dd4..134684f0639 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -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
'';
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 2467ed93b32..c01e1c8c004 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -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
'';
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 3e1f63531bb..2a86fed0d08 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -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
'';
diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix
index 3dcfbf6fd7e..0c932396e9e 100644
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@@ -48,7 +48,7 @@ in buildGoPackage rec {
'';
postInstall = ''
- wrapProgram "$bin/bin/minishift" \
+ wrapProgram "$out/bin/minishift" \
--prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}'
'';
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index bcd259b138f..67845c06695 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -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/*
'';
diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
index 95ad965c346..8ad0e8711f2 100644
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -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
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 50a5129226a..516c4e51402 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -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";
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 26c969c671f..4e3066fc6ab 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -23,7 +23,7 @@ buildGoPackage rec {
'';
postInstall = ''
- wrapProgram $bin/bin/terragrunt \
+ wrapProgram $out/bin/terragrunt \
--set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
'';
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 57925a3292d..2fde398b2f5 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -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
''
diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 8c915762b6e..64a4f8a823c 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -36,7 +36,7 @@ buildGoPackage {
installPhase = ''
runHook preInstall
- install -D grv $bin/bin/grv
+ install -D grv $out/bin/grv
runHook postInstall
'';
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 570fb2ce56f..b18ac251016 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -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 ]}
'';
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 968b26632c7..37a2fc23af0 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -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";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 40860b13e4d..2b4fddaa9c8 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -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; {
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index a35778ac023..48667ad8be3 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -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 ]}
'';
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 7ce4390ba30..fbeb2e3382f 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -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
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 74a316ef52a..dacc404b3a8 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -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; {
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index a4c2be05061..996d52bacab 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -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; {
diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index dde0b481497..cb3518d7d3d 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -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; {
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 2c1ad0b4297..b8f8459796a 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -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
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 87385024967..b29b1f97d21 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -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/*/*
'';
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 4477e7c7b1d..f6a1a3bc6a9 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -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; {
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index 9fb18d04df8..accc7e2b701 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -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 = ''
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index fdbb7856b06..ad818b2606c 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -29,8 +29,6 @@ buildGoPackage rec {
goDeps = ./deps.nix;
- outputs = [ "out" ];
-
nativeBuildInputs = [
pkgconfig
dbus-factory
diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix
index 3050e7b9e13..137417f3754 100644
--- a/pkgs/desktops/deepin/startdde/default.nix
+++ b/pkgs/desktops/deepin/startdde/default.nix
@@ -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 = ''
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index b4ec8bd1706..54d1c743bee 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -203,15 +203,15 @@ let
installPhase = args.installPhase or ''
runHook preInstall
- mkdir -p $bin
+ mkdir -p $out
dir="$NIX_BUILD_TOP/go/bin"
- [ -e "$dir" ] && cp -r $dir $bin
+ [ -e "$dir" ] && cp -r $dir $out
runHook postInstall
'';
preFixup = preFixup + ''
- find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
+ find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
'';
strictDeps = true;
@@ -235,9 +235,6 @@ let
enableParallelBuilding = enableParallelBuilding;
- # I prefer to call this dev but propagatedBuildInputs expects $out to exist
- outputs = args.outputs or [ "bin" "out" ];
-
meta = {
# Add default meta information
homepage = "https://${goPackagePath}";
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 84b28631308..09d1e16a8b0 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -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
'';
diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix
index 55d9854d792..1fa45a32c05 100644
--- a/pkgs/development/tools/cloudfoundry-cli/default.nix
+++ b/pkgs/development/tools/cloudfoundry-cli/default.nix
@@ -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"
'';
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
index 0e6c58aa7ba..005c5d55b79 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -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 = {
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 9182c889598..ceaa704b565 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -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 ]}'
'';
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 1d50e4ff6d5..39178201456 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -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 ]}'
'';
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 7c7862dbe3b..e152b0ba638 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -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; {
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
index 4625c79767f..9e45d5988cc 100644
--- a/pkgs/development/tools/deis/default.nix
+++ b/pkgs/development/tools/deis/default.nix
@@ -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
'';
diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
index 86a1ac6d6b1..9d14f7c1c1e 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
];
postFixup = ''
- wrapProgram $bin/bin/dep2nix \
+ wrapProgram $out/bin/dep2nix \
--prefix PATH : ${nix-prefetch-scripts}/bin
'';
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index f84167afca8..f9c55555536 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -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
'';
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 331c86ad88c..6a23f84f236 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -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
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 96f82cc827f..300f82ee548 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -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
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix
index 3ed719cbfce..603568236e6 100644
--- a/pkgs/development/tools/gocode-gomod/default.nix
+++ b/pkgs/development/tools/gocode-gomod/default.nix
@@ -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; {
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix
index 6436c83ee21..c9bea694549 100644
--- a/pkgs/development/tools/kind/default.nix
+++ b/pkgs/development/tools/kind/default.nix
@@ -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
'';
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index d3afbbc1bc7..2d7431f9e8b 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -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 = {
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix
index 5faeec2387d..434f0186d89 100644
--- a/pkgs/development/tools/out-of-tree/default.nix
+++ b/pkgs/development/tools/out-of-tree/default.nix
@@ -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 ]}"
'';
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 5534492cf37..dce42380c50 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -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
'';
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 7d4e4e0c69e..f7e1478bbec 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -34,7 +34,7 @@ buildGoPackage {
inherit version;
inherit src goPackagePath;
- outputs = [ "bin" "man" "out" ];
+ outputs = [ "out" "man" ];
excludedPackages = [ "integration" ];
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix
index a5c13e2266e..cdf3ed5b71a 100644
--- a/pkgs/development/tools/toxiproxy/default.nix
+++ b/pkgs/development/tools/toxiproxy/default.nix
@@ -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 = {
diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix
index 5f2a45f7427..65cc4b145fb 100644
--- a/pkgs/development/tools/vgo2nix/default.nix
+++ b/pkgs/development/tools/vgo2nix/default.nix
@@ -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; {
diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix
index 5d2550b89cb..ca8b40c4d53 100644
--- a/pkgs/development/tools/wally-cli/default.nix
+++ b/pkgs/development/tools/wally-cli/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
};
postInstall = ''
- mv $bin/bin/cli $bin/bin/wally
+ mv $out/bin/cli $out/bin/wally
'';
goDeps = ./deps.nix;
diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index 3dcfe201d2c..3ca8ee4693a 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -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";
diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix
index 19074a309dd..fb9e1cf6617 100644
--- a/pkgs/games/harmonist/default.nix
+++ b/pkgs/games/harmonist/default.nix
@@ -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";
diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix
index d3f284a2ddb..c3bca18a9a4 100644
--- a/pkgs/misc/logging/beats/6.x.nix
+++ b/pkgs/misc/logging/beats/6.x.nix
@@ -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"
'';
};
}
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index cdc8417a9c1..61c89339fe7 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -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"
'';
};
}
diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix
index 799b73294e8..09a3cd877ab 100644
--- a/pkgs/servers/dex/default.nix
+++ b/pkgs/servers/dex/default.nix
@@ -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; {
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 9a2bf7ce590..bdb4b4883da 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -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; {
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 3088ee190e7..4c5521e97bb 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -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; {
diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix
index bb841da74d2..43c41250970 100644
--- a/pkgs/servers/miniflux/default.nix
+++ b/pkgs/servers/miniflux/default.nix
@@ -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; {
diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix
index 24756cc8bd2..d6f3c28d82b 100644
--- a/pkgs/servers/monitoring/grafana-reporter/default.nix
+++ b/pkgs/servers/monitoring/grafana-reporter/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
};
postInstall = ''
- wrapProgram $bin/bin/grafana-reporter \
+ wrapProgram $out/bin/grafana-reporter \
--prefix PATH : ${makeBinPath [ tetex ]}
'';
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 66e534a0f9a..7fdd9c70d9a 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -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; {
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index a4117d923e3..e8804702f0d 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -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"
'';
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 9074c19e109..9402fa44eed 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -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
'';
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index e43e625e449..28b76234dd8 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -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;
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 8202a8c8c29..b5a93343252 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -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"
'';
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 0cb41f099c6..1425fccdca4 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -29,7 +29,7 @@ buildGoPackage rec {
doInstallCheck = true;
installCheckPhase = ''
- export PATH=$PATH:$bin/bin
+ export PATH=$PATH:$out/bin
pushgateway --help
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix
index 065af0079b0..9f0be68e168 100644
--- a/pkgs/servers/monitoring/uchiwa/default.nix
+++ b/pkgs/servers/monitoring/uchiwa/default.nix
@@ -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
diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix
index e9bd705ffa9..769a8605f03 100644
--- a/pkgs/servers/nginx-sso/default.nix
+++ b/pkgs/servers/nginx-sso/default.nix
@@ -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; {
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index fb62ee58474..2ce8e901e86 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -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";
diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix
index 1f4315afc40..38762b6fd29 100644
--- a/pkgs/tools/admin/docker-credential-helpers/default.nix
+++ b/pkgs/tools/admin/docker-credential-helpers/default.nix
@@ -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; {
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 6051c16e91e..e4ac149a8ed 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -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' "$@"
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 81209444455..b96d6d75725 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -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; {
diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix
index 1d754e4324d..b261289f0bf 100644
--- a/pkgs/tools/backup/duplicacy/default.nix
+++ b/pkgs/tools/backup/duplicacy/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
'';
installPhase = ''
- install -D duplicacy_main $bin/bin/duplicacy
+ install -D duplicacy_main $out/bin/duplicacy
'';
meta = with lib; {
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index df9d613ee44..f366533f9bf 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -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 .
diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix
index c7f12cb751b..45a4df74b15 100644
--- a/pkgs/tools/backup/restic/rest-server.nix
+++ b/pkgs/tools/backup/restic/rest-server.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
'';
installPhase = ''
- install -Dt $bin/bin rest-server
+ install -Dt $out/bin rest-server
'';
meta = with lib; {
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix
index f8d955dbfc1..3f0e261b18d 100644
--- a/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/pkgs/tools/filesystems/gcsfuse/default.nix
@@ -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;{
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 792b12688aa..3c97c168429 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -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 ]}"
'';
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 3c7e72f6d73..7a57c7ad08b 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -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; {
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
index f216e358d8a..c3e9a0dc2ff 100644
--- a/pkgs/tools/misc/mongodb-tools/default.nix
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -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
diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index a66a6688ad4..35bd84005b5 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -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; {
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix
index d2a8a1d0e87..b4f834bdd1a 100644
--- a/pkgs/tools/misc/tewisay/default.nix
+++ b/pkgs/tools/misc/tewisay/default.nix
@@ -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 = {
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 9d4230524be..7b796a52e3a 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -10,7 +10,7 @@ buildGoPackage rec {
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
- wrapProgram "$bin/bin/assh" \
+ wrapProgram "$out/bin/assh" \
--prefix PATH : ${openssh}/bin
'';
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 57d7244148d..dc29a95d92b 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -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
'';
diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix
index a5e8dc10d34..262234ca67b 100644
--- a/pkgs/tools/networking/guardian-agent/default.nix
+++ b/pkgs/tools/networking/guardian-agent/default.nix
@@ -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"
'';
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index a1d2f15ad13..130bf2bb2e5 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -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.";
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index cb640fb1639..4aee3737664 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -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}"
'';
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 4f0b5f2c954..15797fc8665 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -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
'';
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index ae46bbae40a..5c1409dae1a 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -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
'';
diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix
index 95afb580d4e..e1e5e100bd1 100644
--- a/pkgs/tools/security/verifpal/default.nix
+++ b/pkgs/tools/security/verifpal/default.nix
@@ -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 = {
diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index 4dcb6afb00f..805a70c74e9 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
makeFlags = [
"PREFIX=${placeholder "out"}"
- "BINDIR=${placeholder "bin"}/bin"
+ "BINDIR=${placeholder "out"}/bin"
];
buildPhase = ''
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index dced8672ee6..65a7f7d1980 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -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; {
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index a781f3a4424..6ad8c355ee2 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -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 ];