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

Merge pull request #12323 from kragniz/rkt-v0.15.0

Browse Source 
rkt: 0.14.0 -> 0.15.0
This commit is contained in:
Domen Kožar 2016-01-21 22:27:33 +01:00
commit b39c51a362
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/rkt.nix
View File

@ -58,5 +58,7 @@ in
ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
}; };
}; };
users.extraGroups.rkt = {};
}; };
} }

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

@ -1,15 +1,15 @@
{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio { stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
, fetchurl, fetchFromGitHub }: cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
let let
coreosImageRelease = "794.1.0"; coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222"; coreosImageSystemdVersion = "222";
# 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" ]; stage1Flavours = [ "coreos" "fly" "host" ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "0.14.0"; version = "0.15.0";
name = "rkt-${version}"; name = "rkt-${version}";
BUILDDIR="build-${name}"; BUILDDIR="build-${name}";
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
owner = "coreos"; owner = "coreos";
repo = "rkt"; repo = "rkt";
sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71"; sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
}; };
stage1BaseImage = fetchurl { stage1BaseImage = fetchurl {
@ -25,7 +25,10 @@ in stdenv.mkDerivation rec {
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
}; };
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; buildInputs = [
autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
makeWrapper
];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh
@ -45,6 +48,9 @@ in stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp -Rv $BUILDDIR/bin/* $out/bin cp -Rv $BUILDDIR/bin/* $out/bin
wrapProgram $out/bin/rkt \
--prefix LD_LIBRARY_PATH : ${systemd}/lib \
--prefix PATH : ${iptables}/bin
''; '';
meta = with lib; { meta = with lib; {