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

rkt: 0.14.0 -> 0.15.0

Changed files
+14 -6
nixos
modules
virtualisation
pkgs
applications
virtualization
+2
nixos/modules/virtualisation/rkt.nix
···
ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
};
};
};
}
···
ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
};
};
+
+
users.extraGroups.rkt = {};
};
}
+12 -6
pkgs/applications/virtualization/rkt/default.nix
···
-
{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
-
, fetchurl, fetchFromGitHub }:
let
coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222";
# TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-
stage1Flavours = [ "coreos" "fly" ];
in stdenv.mkDerivation rec {
-
version = "0.14.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
···
rev = "v${version}";
owner = "coreos";
repo = "rkt";
-
sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71";
};
stage1BaseImage = fetchurl {
···
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
};
-
buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
preConfigure = ''
./autogen.sh
···
installPhase = ''
mkdir -p $out/bin
cp -Rv $BUILDDIR/bin/* $out/bin
'';
meta = with lib; {
···
+
{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
+
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
let
coreosImageRelease = "794.1.0";
coreosImageSystemdVersion = "222";
# 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";
name = "rkt-${version}";
BUILDDIR="build-${name}";
···
rev = "v${version}";
owner = "coreos";
repo = "rkt";
+
sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
};
stage1BaseImage = fetchurl {
···
sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
};
+
buildInputs = [
+
autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
+
makeWrapper
+
];
preConfigure = ''
./autogen.sh
···
installPhase = ''
mkdir -p $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; {