ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53611 from r-ryantm/auto-update/lxc

Browse Source 
lxc: 3.0.3 -> 3.1.0
This commit is contained in:
Jörg Thalheim 2019-02-08 07:03:35 +00:00 committed by GitHub
commit b2d9782d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/lxc/default.nix
View File

@ -9,11 +9,11 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxc-${version}"; name = "lxc-${version}";
version = "3.0.3"; version = "3.1.0";
src = fetchurl { src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
sha256 = "0hcql4srcs2dlf2f67i8v92y2i352zv7nr9hsgs3pih2rhrbh332"; sha256 = "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -7,13 +7,13 @@
}: }:
buildGoPackage rec { buildGoPackage rec {
name = "lxd-3.0.2"; name = "lxd-3.10";
goPackagePath = "github.com/lxc/lxd"; goPackagePath = "github.com/lxc/lxd";
src = fetchurl { src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz"; url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz";
sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j"; sha256 = "0vd0p3xf54s7f9vcjfiin29py6hxyyxnisvp6am67l5nwhg7rnnc";
}; };
preBuild = '' preBuild = ''
@ -28,8 +28,8 @@ buildGoPackage rec {
buildFlags = [ "-tags libsqlite3" ]; buildFlags = [ "-tags libsqlite3" ];
postInstall = '' postInstall = ''
# binaries from test/ # test binaries, code generation
rm $bin/bin/{deps,macaroon-identity} rm $bin/bin/{deps,macaroon-identity,generate}
wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash