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

Commits on Nov 26, 2020

  1. kube3d: nixpkgs-fmt the file to fit contributing guidelines

    @06kellyjac
    06kellyjac committed Nov 26, 2020
    Copy the full SHA
    c36b5d5 View commit details

  2. kube3d: add a longDescription to provide detail and help searches 

    search.nixos.org was able to show me `deno` when searching for
"executable" which was in the longDescription
    @06kellyjac
    06kellyjac committed Nov 26, 2020
    Copy the full SHA
    7a03c0f View commit details

  3. kube3d: mention k3d in the short description 

    While I was able to find `deno` by searching for "executable" from it's
longDescription on search.nixos.org, I couldn't find it using `nix search`

`nix search` seems to only look at the short description so it's worth
including there too.
    @06kellyjac
    06kellyjac committed Nov 26, 2020
    Copy the full SHA
    168df5f View commit details

  4. kube3d: re-order the derivation and general cleanup 

    Moved k3sVersion to be a variable.
Converted buildFlagsArray to an array
Moved vendorSha256 closer to src
Moved doCheck between build and install related bits (like where the
phase happens)
Replaced stdenv.lib with lib
    @06kellyjac
    06kellyjac committed Nov 26, 2020
    Copy the full SHA
    cdfa9b0 View commit details

  5. Merge pull request #99563 from 06kellyjac/kube3d_discoverability 

    kube3d: increase discoverability
    @kevincox
    kevincox authored Nov 26, 2020
    Copy the full SHA
    a5da6e5 View commit details
Showing with 27 additions and 18 deletions.
  1. +27 −18 pkgs/applications/networking/cluster/kube3d/default.nix
45 changes: 27 additions & 18 deletions pkgs/applications/networking/cluster/kube3d/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,51 @@
{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

let
k3sVersion = "1.19.3-k3s3";
in
buildGoModule rec {
pname = "kube3d";
version = "3.3.0";
k3sVersion = "1.19.3-k3s3";

excludedPackages = ''tools'';
excludedPackages = "tools";

src = fetchFromGitHub {
owner = "rancher";
repo = "k3d";
rev = "v${version}";
owner = "rancher";
repo = "k3d";
rev = "v${version}";
sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima";
};

buildFlagsArray = ''
-ldflags=
-w -s
-X github.com/rancher/k3d/v3/version.Version=v${version}
-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}
'';
vendorSha256 = null;

nativeBuildInputs = [ installShellFiles ];

buildFlagsArray = [
"-ldflags="
"-w"
"-s"
"-X github.com/rancher/k3d/v3/version.Version=v${version}"
"-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}"
];

doCheck = false;

postInstall = ''
installShellCompletion --cmd k3d \
--bash <($out/bin/k3d completion bash) \
--fish <($out/bin/k3d completion fish) \
--zsh <($out/bin/k3d completion zsh)
'';

vendorSha256 = null;

doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/rancher/k3d";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
longDescription = ''
k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
k3d creates containerized k3s clusters. This means, that you can spin up a
multi-node k3s cluster on a single machine using docker.
'';
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ];