home

commit d6877f643d8c76ec5f6d62972cd1a6fa91cbfb28
parent d299d36626f8a431fb0da41092b7e7a2895332c2
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun,  3 Jan 2021 08:31:35 +0100

pkgs: remove goPackagePath from buildGoModule

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
nix/packages/buildx/default.nix
 | 
3
+--
M
nix/packages/ko/default.nix
 | 
2
--
M
nix/packages/krew/default.nix
 | 
1
-
M
nix/packages/manifest-tool/default.nix
 | 
1
-
M
nix/packages/prm/default.nix
 | 
3
+--

5 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/nix/packages/buildx/default.nix b/nix/packages/buildx/default.nix
@@ -5,10 +5,9 @@ buildGoModule rec {
   version = "0.5.1";
   rev = "v${version}";
 
-  goPackagePath = "github.com/docker/buildx";
   subPackages = [ "cmd/buildx" ];
 
-  buildFlagsArray = let t = "${goPackagePath}/version"; in
+  buildFlagsArray = let t = "github.com/docker/buildx/version"; in
     ''
       -ldflags=
         -X ${t}.Version=${version}
diff --git a/nix/packages/ko/default.nix b/nix/packages/ko/default.nix
@@ -5,8 +5,6 @@ buildGoModule rec {
   name = "${pname}-${version}";
   version = "0.6.2";
 
-  goPackagePath = "github.com/google/ko";
-
   src = fetchFromGitHub {
     owner = "google";
     repo = "ko";
diff --git a/nix/packages/krew/default.nix b/nix/packages/krew/default.nix
@@ -5,7 +5,6 @@ buildGoModule rec {
   version = "0.3.4";
   rev = "v${version}";
 
-  goPackagePath = "github.com/kubernetes-sigs/krew";
   subPackages = [ "cmd/krew" ];
   src = fetchFromGitHub {
     inherit rev;
diff --git a/nix/packages/manifest-tool/default.nix b/nix/packages/manifest-tool/default.nix
@@ -6,7 +6,6 @@ buildGoModule rec {
   #rev = "v${version}";
   rev = "bae5531170d45955c2d72d1b29d77ce1b0c9dedb";
 
-  goPackagePath = "github.com/estep/manifest-tool";
   subPackages = [ "cmd/manifest-tool" ];
 
   src = fetchFromGitHub {
diff --git a/nix/packages/prm/default.nix b/nix/packages/prm/default.nix
@@ -5,8 +5,7 @@ buildGoModule rec {
   version = "3.4.0";
   rev = "v${version}";
 
-  goPackagePath = "github.com/ldez/prm/v3";
-  buildFlagsArray = let t = "${goPackagePath}/meta"; in
+  buildFlagsArray = let t = "github.com/ldez/prm/v3/meta"; in
     ''
       -ldflags=
          -X ${t}.Version=${version}