Merge remote-tracking branch 'upstream/master' into HEAD

2017-07-29 13:08:11 +02:00
parent 55357de67a 140f47eb74
commit b2608b8910
45 changed files with 1105 additions and 303 deletions
@@ -12,7 +12,7 @@ let
  stage1Dir = "lib/rkt/stage1-images";

 in stdenv.mkDerivation rec {
-  version = "1.27.0";
+  version = "1.28.0";
  name = "rkt-${version}";
  BUILDDIR="build-${name}";

@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
    owner = "coreos";
    repo = "rkt";
    rev = "v${version}";
-    sha256 = "153nkl4mp2p0llv4bpdhdd6127qyaz27jsnxmjgvxhaia0ab79v2";
+    sha256 = "08bzi44rs4g8cxb44pxh7ln85zhkhmi40r8mb73kibnnzd008vg3";
  };

  stage1BaseImage = fetchurl {