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

Merge pull request #16348 from zackp30/fix_lxd_module

Browse Source 
Fix lxd module
This commit is contained in:
zimbatm 2016-06-19 22:07:42 +01:00 committed by GitHub
commit 44d99e90e9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ in
# TODO(wkennington): Add lvm2 and thin-provisioning-tools # TODO(wkennington): Add lvm2 and thin-provisioning-tools
path = with pkgs; [ acl rsync gnutar xz btrfs-progs ]; path = with pkgs; [ acl rsync gnutar xz btrfs-progs ];
serviceConfig.ExecStart = "@${pkgs.lxd}/bin/lxd lxd --syslog --group lxd"; serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd";
serviceConfig.Type = "simple"; serviceConfig.Type = "simple";
serviceConfig.KillMode = "process"; # when stopping, leave the containers alone serviceConfig.KillMode = "process"; # when stopping, leave the containers alone
}; };

8
pkgs/tools/admin/lxd/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
name = "lxd-${version}"; name = "lxd-${version}";
version = "2.0.0.rc4"; version = "2.0.2";
rev = "lxd-${version}"; rev = "lxd-${version}";
goPackagePath = "github.com/lxc/lxd"; goPackagePath = "github.com/lxc/lxd";
@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev; inherit rev;
owner = "lxc"; owner = "lxc";
repo = "lxd"; repo = "lxd";
sha256 = "1rpyyj6d38d9kmb47dcmy1x41fiacj384yx01yslsrj2l6qxcdjn"; sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs";
}; };
goDeps = ./deps.json; goDeps = ./deps.json;
@ -19,10 +19,6 @@ buildGoPackage rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lxc ]; buildInputs = [ lxc ];
postInstall = ''
cp go/src/$goPackagePath/scripts/lxd-images $bin/bin
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Daemon based on liblxc offering a REST API to manage containers"; description = "Daemon based on liblxc offering a REST API to manage containers";
homepage = https://github.com/lxc/lxd; homepage = https://github.com/lxc/lxd;