From 3f175184904d925ad21bf07b1c783d2977a5a4c5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 18 Apr 2020 23:21:06 +1000
Subject: [PATCH] buildGoPackage: use $out instead of $bin
---
doc/languages-frameworks/go.xml | 12 ------------
nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++
pkgs/development/go-packages/generic/default.nix | 9 +++------
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 84b146532b14..70c135555ea4 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 07f11239366b..65cea9ca1c48 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/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index b4ec8bd1706e..54d1c743bee0 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}";