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: d8f3ef1c1435
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8708b6d871ac
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 20, 2021

  1. kube3d: 3.4.0 -> 4.0.0

    @06kellyjac
    06kellyjac committed Jan 20, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    acdlite Andrew Clark
    SSH Key Fingerprint: kMgJy+7AI/mxxpuyx1Qgc7NZY55dREBRubChEAYfi7I
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4f31c7c View commit details

Commits on Jan 25, 2021

  1. Merge pull request #106176 from 06kellyjac/kube3d_4.0.0 

    kube3d: 3.4.0 -> 4.0.0
    @kevincox
    kevincox authored Jan 25, 2021
    Copy the full SHA
    8708b6d View commit details
Showing with 5 additions and 8 deletions.
  1. +5 −8 pkgs/applications/networking/cluster/kube3d/default.nix
13 changes: 5 additions & 8 deletions pkgs/applications/networking/cluster/kube3d/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }:

let
k3sVersion = "1.20.0-k3s2";
in
buildGoModule rec {
pname = "kube3d";
version = "3.4.0";
version = "4.0.0";

excludedPackages = "tools";

src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
sha256 = "1fisbzv786n841pagy7zbanll7k1g5ib805j9azs2s30cfhvi08b";
sha256 = "sha256-sHtPW9EaTycHh9d/vp28BvzhmbLUQYsu6yMfJlJYH+k=";
};

vendorSha256 = null;
@@ -24,8 +21,8 @@ buildGoModule rec {
"-ldflags="
"-w"
"-s"
"-X github.com/rancher/k3d/v3/version.Version=v${version}"
"-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}"
"-X github.com/rancher/k3d/v4/version.Version=v${version}"
"-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}"
];

doCheck = false;