Merge pull request #12130 from NixOS/revert-11946-rkt

Revert "rkt: align stage1 information with upstream source"
This commit is contained in:
Arseniy Seroka 2016-01-04 14:39:44 +03:00
commit e8b2b08c0d

View file

@ -2,11 +2,11 @@
, fetchurl, fetchFromGitHub }:
let
coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222";
coreosImageRelease = "835.9.0";
coreosImageSystemdVersion = "225";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
stage1Flavours = [ "coreos" "fly" ];
stage1Flavours = [ "coreos" ];
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 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
sha256 = "51dc10b4269b9c1801c233de49da817d29ca8d858bb0881df94dc90f7e86ce70";
};
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];