Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 952f136fa8f5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 821ed09f382d
Choose a head ref
  • 10 commits
  • 9 files changed
  • 2 contributors

Commits on Dec 17, 2020

  1. buildGoModule: disallow goPackagePath 

    This is unnecessary with `buildGoModule`, it's usually cruft from `buildGoPackage` conversions.
    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    863706e View commit details

  2. sonobuoy: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    a015752 View commit details

  3. buildkite-agent: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    566bce3 View commit details

  4. github-commenter: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    e8829ac View commit details

  5. terraform-ls: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    4782aa4 View commit details

  6. wally-cli: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    fe11b54 View commit details

  7. ytt: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    381095f View commit details

  8. demoit: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    a8b883b View commit details

  9. cod: remove goPackagePath

    @zowoq
    zowoq committed Dec 17, 2020
    Copy the full SHA
    9209f09 View commit details

  10. Merge pull request #107085 from zowoq/go-mod-packagepath 

    buildGoModule: disallow goPackagePath
    @Ma27
    Ma27 authored Dec 17, 2020
    Copy the full SHA
    821ed09 View commit details
4 changes: 1 addition & 3 deletions pkgs/applications/networking/cluster/sonobuoy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,8 @@ buildGoModule rec {
pname = "sonobuoy";
version = "0.19.0";

goPackagePath = "github.com/vmware-tanzu/sonobuoy";

buildFlagsArray =
let t = goPackagePath;
let t = "github.com/vmware-tanzu/sonobuoy";
in ''
-ldflags=
-s -X ${t}/pkg/buildinfo.Version=v${version}
5 changes: 5 additions & 0 deletions pkgs/development/go-modules/generic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,9 @@

, meta ? {}

# Not needed with buildGoModule
, goPackagePath ? null

, ... }@args':

with builtins;
@@ -242,5 +245,7 @@ let
});
in if disabled then
throw "${package.name} not supported for go ${go.meta.branch}"
else if (goPackagePath != null) then
throw "`goPackagePath` not needed with `buildGoModule`"
else
package
2 changes: 0 additions & 2 deletions pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@ buildGoModule rec {
name = "buildkite-agent-${version}";
version = "3.26.0";

goPackagePath = "github.com/buildkite/agent";

src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
2 changes: 0 additions & 2 deletions pkgs/development/tools/github-commenter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ buildGoModule rec {

vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0=";

goPackagePath = "github.com/cloudposse/${pname}";

meta = with lib; {
description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues";
license = licenses.asl20;
2 changes: 0 additions & 2 deletions pkgs/development/tools/misc/terraform-ls/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,6 @@ buildGoModule rec {
};
vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI=";

goPackagePath = "github.com/hashicorp/terraform-ls";

# tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com
doCheck = false;

1 change: 0 additions & 1 deletion pkgs/development/tools/wally-cli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ buildGoModule rec {
pname = "wally-cli";
version = "2.0.0";

goPackagePath = "github.com/zsa/wally-cli";
subPackages = [ "." ];

nativeBuildInputs = [ pkg-config ];
2 changes: 0 additions & 2 deletions pkgs/development/tools/ytt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,8 +10,6 @@ buildGoModule rec {
sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l";
};

goPackagePath = "github.com/vmware-tanzu/carvel-ytt";

vendorSha256 = null;

subPackages = [ "cmd/ytt" ];
1 change: 0 additions & 1 deletion pkgs/servers/demoit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
buildGoModule {
pname = "demoit";
version = "unstable-2020-06-11";
goPackagePath = "github.com/dgageot/demoit";

src = fetchFromGitHub {
owner = "dgageot";
2 changes: 0 additions & 2 deletions pkgs/tools/misc/cod/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@ buildGoModule rec {
pname = "cod";
version = "unstable-2020-09-10";

goPackagePath = "cod";

src = fetchFromGitHub {
owner = "dim-an";
repo = pname;