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

Commits on Apr 7, 2020

  1. k3s: remove extra buildInputs 

    In the intial version of this package, I missed a few inputs that
weren't needed including a debug hook.
    @euank
    euank committed Apr 7, 2020
    Copy the full SHA
    83f827c View commit details

  2. k3s: update maintainers, per pr comment

    @euank
    euank committed Apr 7, 2020
    Copy the full SHA
    617fa43 View commit details

  3. Merge pull request #84384 from euank/pkg/k3s-update 

    k3s: remove extra buildInputs
    @flokli
    flokli authored Apr 7, 2020
    Copy the full SHA
    7183053 View commit details
Showing with 12 additions and 12 deletions.
  1. +12 −12 pkgs/applications/networking/cluster/k3s/default.nix
24 changes: 12 additions & 12 deletions pkgs/applications/networking/cluster/k3s/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils
, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig
, autoPatchelfHook, breakpointHook, ethtool, utillinux, ipset
, fetchFromGitHub, fetchurl, fetchzip, fetchgit
, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip
, fetchgit
}:

with lib;
@@ -64,10 +64,10 @@ let
};

meta = {
description = "k3s-cni-plugins";
description = "CNI plugins, as patched by rancher for k3s";
license = licenses.asl20;
homepage = https://k3s.io;
maintainers = [];
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
};
@@ -76,7 +76,7 @@ let
k3sRepo = fetchgit {
url = "https://github.com/rancher/k3s";
rev = "v${k3sVersion}";
leaveDotGit = true; # for version / build date below
leaveDotGit = true; # ./scripts/version.sh depends on git
sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm";
};
# Stage 1 of the k3s build:
@@ -110,8 +110,8 @@ let

patches = [ ./patches/00-k3s.patch ];

nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ];
buildInputs = [ git runc libseccomp ];
nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ libseccomp ];

buildPhase = ''
pushd go/src/${goPackagePath}
@@ -136,7 +136,7 @@ let
description = "The various binaries that get packaged into the final k3s binary.";
license = licenses.asl20;
homepage = https://k3s.io;
maintainers = [];
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
};
@@ -150,8 +150,8 @@ let

patches = [ ./patches/00-k3s.patch ];

nativeBuildInputs = [ pkgconfig autoPatchelfHook breakpointHook ];
buildInputs = [ git k3sBuildStage1 ];
nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ k3sBuildStage1 k3sPlugins runc ];

# In order to build the thick k3s binary (which is what
# ./scripts/package-cli does), we need to get all the binaries that script
@@ -191,7 +191,7 @@ let
description = "The k3s go binary which is used by the final wrapped output below.";
license = licenses.asl20;
homepage = https://k3s.io;
maintainers = [];
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
};
@@ -229,7 +229,7 @@ stdenv.mkDerivation rec {
description = "A lightweight Kubernetes distribution.";
license = licenses.asl20;
homepage = https://k3s.io;
maintainers = with maintainers; [ euank ];
maintainers = [ maintainers.euank ];
platforms = platforms.linux;
};
}