public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10590 from steveeJ/rkt

Browse Source 
rkt: bump to v0.10.0
This commit is contained in:
Domen Kožar 2015-10-25 02:10:02 +01:00
commit 63737e7d43
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -266,6 +266,7 @@
sprock = "Roger Mason <rmason@mun.ca>"; sprock = "Roger Mason <rmason@mun.ca>";
spwhitt = "Spencer Whitt <sw@swhitt.me>"; spwhitt = "Spencer Whitt <sw@swhitt.me>";
stephenmw = "Stephen Weinberg <stephen@q5comm.com>"; stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
steveej = "Stefan Junker <mail@stefanjunker.de>";
szczyp = "Szczyp <qb@szczyp.com>"; szczyp = "Szczyp <qb@szczyp.com>";
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>"; sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
tailhook = "Paul Colomiets <paul@colomiets.name>"; tailhook = "Paul Colomiets <paul@colomiets.name>";

30
pkgs/applications/virtualization/rkt/default.nix
View File

@ -2,47 +2,53 @@
, fetchurl, fetchFromGitHub }: , fetchurl, fetchFromGitHub }:
let let
coreosImageRelease = "738.1.0"; coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222";
stage1Flavour = "coreos";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "0.8.0"; version = "0.10.0";
name = "rkt-${version}"; name = "rkt-${version}";
BUILDDIR="build-${name}";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "coreos"; owner = "coreos";
repo = "rkt"; repo = "rkt";
sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0"; sha256 = "1d9n00wkzib4v5mfl46f2mqc8zfpv33kqixifmv8p4azqv78cbxn";
}; };
stage1image = fetchurl { stage1BaseImage = fetchurl {
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0"; sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
}; };
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh
configureFlagsArray=(
--with-stage1=${stage1Flavour}
--with-stage1-image-path=$out/stage1-${stage1Flavour}.aci
--with-coreos-local-pxe-image-path=${stage1BaseImage}
--with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion}
);
''; '';
preBuild = '' preBuild = ''
# hack to avoid downloading image during build, this has been export BUILDDIR
# improved in rkt master
mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos
cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -Rv build-rkt-${version}/bin/* $out/bin cp -Rv $BUILDDIR/bin/* $out/bin
''; '';
meta = with lib; { meta = with lib; {
description = "A fast, composable, and secure App Container runtime for Linux"; description = "A fast, composable, and secure App Container runtime for Linux";
homepage = http://rkt.io; homepage = https://github.com/coreos/rkt;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ragge ]; maintainers = with maintainers; [ ragge steveej ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }