Merge pull request #12831 from colemickens/rkt-1.0.0
rkt 0.15.0 -> 1.0.0 + trousers
This commit is contained in:
commit
50f94c2751
@ -1,15 +1,15 @@
|
||||
{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
|
||||
{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
|
||||
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
|
||||
|
||||
let
|
||||
coreosImageRelease = "794.1.0";
|
||||
coreosImageSystemdVersion = "222";
|
||||
coreosImageRelease = "835.12.0";
|
||||
coreosImageSystemdVersion = "225";
|
||||
|
||||
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
|
||||
stage1Flavours = [ "coreos" "fly" "host" ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "0.15.0";
|
||||
version = "1.0.0";
|
||||
name = "rkt-${version}";
|
||||
BUILDDIR="build-${name}";
|
||||
|
||||
@ -17,16 +17,16 @@ in stdenv.mkDerivation rec {
|
||||
rev = "v${version}";
|
||||
owner = "coreos";
|
||||
repo = "rkt";
|
||||
sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
|
||||
sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
|
||||
};
|
||||
|
||||
stage1BaseImage = fetchurl {
|
||||
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
|
||||
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
|
||||
url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
|
||||
sha256 = "0djzgfcqr9yy13i415204ji82lrk8mvdhl9rxjr123j1glf5sdh3";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
|
||||
autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user