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

Commits on Nov 22, 2020

  1. runc: add wrapper for procps, systemd 

    for cgroupsv2 it needs `busctl` and `systemctl` in its PATH.
    @zowoq
    zowoq committed Nov 22, 2020
    Copy the full SHA
    50e24b8 View commit details

Commits on Nov 26, 2020

  1. Merge pull request #104545 from zowoq/runc 

    runc: add wrapper for systemd
    @flokli
    flokli authored Nov 26, 2020
    Copy the full SHA
    1cdbdc3 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/applications/virtualization/runc/default.nix
7 changes: 6 additions & 1 deletion pkgs/applications/virtualization/runc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
, apparmor-parser
, libseccomp
, libselinux
, makeWrapper
, procps
, nixosTests
}:

@@ -26,7 +28,7 @@ buildGoPackage rec {
goPackagePath = "github.com/opencontainers/runc";
outputs = [ "out" "man" ];

nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ];

buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];

@@ -43,6 +45,9 @@ buildGoPackage rec {
installPhase = ''
install -Dm755 runc $out/bin/runc
installManPage man/*/*.[1-9]
wrapProgram $out/bin/runc \
--prefix PATH : ${lib.makeBinPath [ procps ]} \
--prefix PATH : /run/current-system/systemd/bin
'';

passthru.tests = { inherit (nixosTests) cri-o docker podman; };