about summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-08-12 09:46:53 +0000
committerRobin Gloster <mail@glob.in>2016-08-12 09:46:53 +0000
commitb7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch)
treec4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/applications/virtualization
parentbc025e83bd6c44df38851ef23da53359a0e62841 (diff)
parent532b2222965377e77ed884c463ee2751fb51dba3 (diff)
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/rkt/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index e33ce9361adf1..f5a6991dc80fb 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.11.0";
+  version = "1.12.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "05lm9grckbyjmv1292v00vw4h3nv6r7gmq04zhahcjyw7crx06sv";
+      sha256 = "0fkjhmssxyx2q699zcif5fvnpcs50l9pqrvy680dw670wsl3b7s7";
   };
 
   stage1BaseImage = fetchurl {