Merge master into staging-next

2018-11-24 10:43:33 +01:00
parent 90720d0139 25c562e451
commit e41154d1ab
92 changed files with 1146 additions and 386 deletions
@@ -5,13 +5,13 @@ with lib;

 stdenv.mkDerivation rec {
  name = "runc-${version}";
-  version = "1.0.0-rc5";
+  version = "1.0.0-rc6";

  src = fetchFromGitHub {
    owner = "opencontainers";
    repo = "runc";
    rev = "v${version}";
-    sha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
+    sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
  };

  outputs = [ "out" "man" ];