alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lxc: 1.1.5 -> 2.0.0

Browse source
This commit is contained in:
Franz Pletz 2016-04-12 04:51:30 +02:00
parent 42e5be8f55
commit 7d9d876140
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/os-specific/linux/lxc/default.nix
View file

@ -12,11 +12,11 @@ in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxc-${version}"; name = "lxc-${version}";
version = "1.1.5"; version = "2.0.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 = "1gnhgs4i2zamfdydj895inr9i072658wd47nf1ryw5710hdsv24m"; sha256 = "1r0hgk91n3frrmla1681l74ag5sngbbkdagvjfqzxwcf9l8pwwsv";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -29,10 +29,6 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./support-db2x.patch ./support-db2x.patch
(fetchpatch {
url = "https://github.com/lxc/lxc/commit/3db8dd39a797f87f8b348f1b6b44953a25f3f170.patch";
sha256 = "0scbzm9dqqhqsl0ri8da8a34r4qj9ph0cg68l9s7gw01vpvqbs8l";
})
]; ];
XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
@ -40,7 +36,6 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--enable-doc"
"--disable-api-docs" "--disable-api-docs"
"--with-init-script=none" "--with-init-script=none"
"--with-distro=nixos" # just to be sure it is "unknown" "--with-distro=nixos" # just to be sure it is "unknown"

4
pkgs/os-specific/linux/lxc/support-db2x.patch
View file

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 92a4690..4dd341b 100644 index 84f8699..dce9033 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then @@ -192,9 +192,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
AC_SUBST(db2xman) AC_SUBST(db2xman)
fi fi
AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"])