home

commit d5767e328d107377d24e8a38a604bdb5117df405
parent ff8610001dee97d53cf854f8f7d1e1674965252b
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun,  3 Jan 2021 09:02:38 +0100

packages: remove more goPackagePath

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

Diffstat:
M
nix/packages/athens/default.nix
 | 
1
-
M
nix/packages/buildkit/default.nix
 | 
3
+--
M
nix/packages/gogo-protobuf/default.nix
 | 
1
-
M
nix/packages/operator-sdk/default.nix
 | 
3
+--
M
nix/packages/protobuild/default.nix
 | 
1
-
M
nix/packages/rmapi/default.nix
 | 
2
--

6 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/nix/packages/athens/default.nix b/nix/packages/athens/default.nix
@@ -5,7 +5,6 @@ buildGoModule rec {
   version = "0.10.0";
   rev = "v${version}";
 
-  goPackagePath = "github.com/gomods/athens";
   subPackages = [ "cmd/proxy" ];
 
   src = fetchFromGitHub {
diff --git a/nix/packages/buildkit/default.nix b/nix/packages/buildkit/default.nix
@@ -5,10 +5,9 @@ buildGoModule rec {
   version = "0.8.0";
   rev = "v${version}";
 
-  goPackagePath = "github.com/moby/buildkit";
   subPackages = [ "cmd/buildctl" "cmd/buildkitd" ];
 
-  buildFlagsArray = let t = "${goPackagePath}/version"; in
+  buildFlagsArray = let t = "github.com/moby/buildkit/version"; in
     ''
       -ldflags=
         -X ${t}.Version=${version}
diff --git a/nix/packages/gogo-protobuf/default.nix b/nix/packages/gogo-protobuf/default.nix
@@ -5,7 +5,6 @@ buildGoModule rec {
   version = "1.3.1";
   rev = "v${version}";
 
-  goPackagePath = "github.com/gogo/protobuf";
   subPackages = [
     "proto"
     "gogoproto"
diff --git a/nix/packages/operator-sdk/default.nix b/nix/packages/operator-sdk/default.nix
@@ -16,11 +16,10 @@ rec {
 
       builtInputs = [ "git" ];
 
-      goPackagePath = "github.com/operator-framework/operator-sdk";
       subPackages = [ "cmd/operator-sdk" ];
       buildFlagsArray =
         let
-          t = "${goPackagePath}/version";
+          t = "github.com/operator-framework/operator-sdk/version";
         in
         ''
           -ldflags=
diff --git a/nix/packages/protobuild/default.nix b/nix/packages/protobuild/default.nix
@@ -5,7 +5,6 @@ buildGoModule rec {
   version = "2020-04-14";
   rev = "324b1750ca060b814b18f4142b544b292d42968e";
 
-  goPackagePath = "github.com/stevvooe/protobuild";
   src = fetchFromGitHub {
     inherit rev;
     owner = "stevvooe";
diff --git a/nix/packages/rmapi/default.nix b/nix/packages/rmapi/default.nix
@@ -5,8 +5,6 @@ buildGoModule rec {
   version = "0.0.12";
   rev = "v${version}";
 
-  goPackagePath = "github.com/juruen/rmapi";
-
   src = fetchFromGitHub {
     inherit rev;
     owner = "juruen";