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

Merge pull request #14935 from steveeJ/rkt-v1.4.0

Browse Source 
rkt: 1.2.0 -> 1.4.0
This commit is contained in:
Arseniy Seroka 2016-04-23 22:42:29 +03:00
commit f83f6cb6c8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools, { stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }: cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
let let
coreosImageRelease = "794.1.0"; coreosImageRelease = "991.0.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 = "1.2.0"; version = "1.4.0";
name = "rkt-${version}"; name = "rkt-${version}";
BUILDDIR="build-${name}"; BUILDDIR="build-${name}";
@ -17,15 +17,16 @@ in stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
owner = "coreos"; owner = "coreos";
repo = "rkt"; repo = "rkt";
sha256 = "0icsrh118mm3rabbcr0gd3b22m5rizdbqlrfp9d79g591p7bjh38"; sha256 = "0lnvqhg88aa6zx4wnkz17v3f529i9hi0y2aihfsq09pvsn56hwjl";
}; };
stage1BaseImage = 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 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; sha256 = "1vaimrbynhjh4f30rq92bv1h3c1lxnf8isx5c2qvnn3lghypss9k";
}; };
buildInputs = [ buildInputs = [
glibc.out glibc.static
autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
makeWrapper makeWrapper
]; ];