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

Merge pull request #12831 from colemickens/rkt-1.0.0

Browse Source 
rkt 0.15.0 -> 1.0.0 + trousers
This commit is contained in:
Arseniy Seroka 2016-02-05 17:32:45 +03:00
commit 50f94c2751
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 }: cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
let let
coreosImageRelease = "794.1.0"; coreosImageRelease = "835.12.0";
coreosImageSystemdVersion = "222"; coreosImageSystemdVersion = "225";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
stage1Flavours = [ "coreos" "fly" "host" ]; stage1Flavours = [ "coreos" "fly" "host" ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "0.15.0"; version = "1.0.0";
name = "rkt-${version}"; name = "rkt-${version}";
BUILDDIR="build-${name}"; BUILDDIR="build-${name}";
@ -17,16 +17,16 @@ in stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
owner = "coreos"; owner = "coreos";
repo = "rkt"; repo = "rkt";
sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf"; sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
}; };
stage1BaseImage = fetchurl { stage1BaseImage = fetchurl {
url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; sha256 = "0djzgfcqr9yy13i415204ji82lrk8mvdhl9rxjr123j1glf5sdh3";
}; };
buildInputs = [ buildInputs = [
autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
makeWrapper makeWrapper
]; ];