summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorStefan Junker <mail@stefanjunker.de>2015-12-25 10:01:04 +0100
committerStefan Junker <mail@stefanjunker.de>2015-12-28 14:20:12 +0100
commite3630bcf89b2d325743e20516ffc261ab635b9b1 (patch)
treef8df1b7aa560f2b6c352e2643a7615706eb74194 /pkgs/applications/virtualization
parent6878b2b21ded9e29e55ea7a3c564715877692e58 (diff)
downloadnixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.tar
nixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.tar.gz
nixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.tar.bz2
nixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.tar.lz
nixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.tar.xz
nixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.tar.zst
nixpkgs-e3630bcf89b2d325743e20516ffc261ab635b9b1.zip
rkt: align stage1 information with upstream source
We rely on the upstream tests and hence should not change the
constellation.

See: https://github.com/coreos/rkt/blob/v0.14.0/stage1/usr_from_coreos/coreos-common.mk

Additionally add the "fly" stage1.
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/rkt/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index eb2a5d737a3..801f658d038 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,11 +2,11 @@
 , fetchurl, fetchFromGitHub }:
 
 let
-  coreosImageRelease = "835.9.0";
-  coreosImageSystemdVersion = "225";
+  coreosImageRelease = "794.1.0";
+  coreosImageSystemdVersion = "222";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-  stage1Flavours = [ "coreos" ];
+  stage1Flavours = [ "coreos" "fly" ];
 
 in stdenv.mkDerivation rec {
   version = "0.14.0";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   stage1BaseImage = fetchurl {
     url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "51dc10b4269b9c1801c233de49da817d29ca8d858bb0881df94dc90f7e86ce70";
+    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];