From 445f60c1e36de24a86b971ed60c159d53839166c Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 23 Jun 2016 14:15:47 -0700 Subject: [PATCH 1/3] rkt: 1.8.0 -> 1.9.0 --- pkgs/applications/virtualization/rkt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index e602688b8ce..7053479b42a 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,14 +4,14 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1032.0.0"; + coreosImageRelease = "1068.0.0"; coreosImageSystemdVersion = "229"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" "host" ]; in stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.9.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -19,12 +19,12 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0n4xjvvvkqk83npiqz13cv82lmnsqpzzyjc03lyz6svw2pdszmhd"; + sha256 = "0vcvy98ch3lf28wk2kfmmr1rdlnikq7h7mx79n6vkplgjl4d7qf7"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "1lmyhncvw5cby4nbpw6ryiki05wra90fsr6xnsdgi9yqqs6v2d1f"; + sha256 = "06jawmjkhrrw9hsk98w5j6pxci17d46mvzbj52pslakacw60pbpp"; }; buildInputs = [ From 5f2d74684660d2c96573a82eb04dd4cc8d4c0c12 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 24 Jun 2016 12:54:53 -0700 Subject: [PATCH 2/3] rkt: 1.9.0 -> 1.9.1 --- pkgs/applications/virtualization/rkt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 7053479b42a..0989c4c58ae 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -11,7 +11,7 @@ let stage1Flavours = [ "coreos" "fly" "host" ]; in stdenv.mkDerivation rec { - version = "1.9.0"; + version = "1.9.1"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0vcvy98ch3lf28wk2kfmmr1rdlnikq7h7mx79n6vkplgjl4d7qf7"; + sha256 = "094pqxcn91g1s3f0ly3z2lb11s4q3dn99h8cr7lqalkd0gj9l4xg"; }; stage1BaseImage = fetchurl { From c357a6a7ac5defb4411a859b73e7a9a88dd348f7 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 24 Jun 2016 12:55:03 -0700 Subject: [PATCH 3/3] rkt: remove incompatible stage1-host --- pkgs/applications/virtualization/rkt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 0989c4c58ae..2fee98ac499 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -8,7 +8,7 @@ let coreosImageSystemdVersion = "229"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" "host" ]; + stage1Flavours = [ "coreos" "fly" ]; in stdenv.mkDerivation rec { version = "1.9.1";