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

Commits on Dec 9, 2020

  1. 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.
Running `nix-store -q --tree /nix/store/path/to/k3s` produces a
different output after this change which includes the `libseccomp`
reference I expect.
    @euank
    euank committed Dec 9, 2020
    Copy the full SHA
    6eb941d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #101739 from euank/k3s-seccomp-dep 

    k3s: propagate runtime dependencies of the k3s binary
    @flokli
    flokli committed Dec 9, 2020
    Copy the full SHA
    c275660 View commit details
    Browse the repository at this point in the history