Commit 403e91cffdf2

@@ -25,7 +25,7 @@ in
 
     environment.etc."containers/libpod.conf".text = ''
       image_default_transport = "docker://"
-      runtime_path = ["${pkgs.runc}/bin/runc"]
+      runtime_path = ["${pkgs.runc-edge}/bin/runc"]
       conmon_path = ["${pkgs.conmon}/bin/conmon"]
       cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"]
       cgroup_manager = "systemd"
@@ -80,7 +80,7 @@ in
 }
     '';
 
-    environment.systemPackages = [ pkgs.podman pkgs.conmon pkgs.runc ];
+    environment.systemPackages = [ pkgs.podman pkgs.conmon pkgs.runc-edge ];
 
   };
 }

@@ -47,7 +47,7 @@ in
 
     packages = mkOption {
       type = types.listOf types.package;
-      default = [ pkgs.runc ];
+      default = [ pkgs.runc-edge ];
       description = "List of packages to be added to containerd service path";
     };
 

@@ -5,7 +5,7 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "runc-${version}";
-  version = "v1.0.0-dev";
+  version = "1.0.0-rc6";
 
   src = fetchFromGitHub {
     owner = "opencontainers";

@@ -9,6 +9,7 @@
     buildkitd= {
       enable = true;
       package = pkgs.buildkit;
+      packages = [ pkgs.runc-edge pkgs.git ];
       extraOptions = "--oci-worker=false --containerd-worker=true";
     };
   };

@@ -12,7 +12,7 @@
     containerd = {
       enable = true;
       package = pkgs.containerd-edge;
-      packages = [ pkgs.runc-edge];
+      packages = [ pkgs.runc-edge ];
     };
   };
 }

@@ -12,7 +12,7 @@
       package = pkgs.docker-edge;
       liveRestore = false;
       storageDriver = "overlay2";
-      extraOptions = "--label=type=desktop --experimental --init --debug --add-runtime docker-runc=${pkgs.runc}/bin/runc --default-runtime=docker-runc --containerd=/run/containerd/containerd.sock --insecure-registry 172.30.0.0/16";
+      extraOptions = "--label=type=desktop --experimental --init --debug --add-runtime docker-runc=${pkgs.runc-edge}/bin/runc --default-runtime=docker-runc --containerd=/run/containerd/containerd.sock --insecure-registry 172.30.0.0/16";
     };
   };
   networking.firewall.trustedInterfaces = [ "docker0" ];