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
base: 65c9cc79f1d1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 344652380833
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 10, 2020

  1. k3s: 1.18.12+k3s1 -> 1.18.12+k3s2 

    Bumped to fix CVE-2020-15257. See the upstream release notes for that:
https://github.com/k3s-io/k3s/releases/tag/v1.18.12%2Bk3s2

This isn't a direct backport of 5ca87dc, since master has since moved
on on to 1.19.x, but it's related in spirit.
    @euank
    euank committed Dec 10, 2020
    Copy the full SHA
    8347011 View commit details
    Browse the repository at this point in the history

  2. k3s: propagate runtime dependencies of the k3s binary 

    Fixes #101734

Prior to this change, the k3s binary included a tarball containing
binaries like 'kubectl', but didn't keep a runtime reference to those
runtime dependencies in plaintext (since they were gzipped inside the
single combined k3s binary).

In order for nix's automatic runtime dependency detection to work, we
need to have a reference to them somewhere in $out.
propagatedBuildInputs seems to do the right thing for us here.

(cherry picked from commit 6eb941d)

Reason: this is necessary both for tests to pass for the preceeding
commit, and for the correctness of the package.
    @euank
    euank committed Dec 10, 2020
    Copy the full SHA
    79bc493 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #106508 from euank/20-09-k3s-CVE-2020-15257 

    k3s: 1.18.12+k3s1 -> 1.18.12+k3s2
    @flokli
    flokli committed Dec 10, 2020
    Copy the full SHA
    3446523 View commit details
    Browse the repository at this point in the history