pyrox.dev / nixpkgs
lol
fork atom

lxc: update to current git HEAD 1.0.0.alpha1-92-g8111adf

The developers claim that the new version works on systemd-based hosts.

Peter Simons e857fee7 9c6e0e58

+27 -77
unified split
+8 -10
pkgs/os-specific/linux/lxc/default.nix
··· 1 - { stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }: 1 + { stdenv, autoreconfHook, fetchurl, libcap, apparmor, perl, docbook2x 2 + , docbook_xml_dtd_45, gnutls, pkgconfig 3 + }: 2 4 3 5 stdenv.mkDerivation rec { 4 - name = "lxc-0.9.0"; 6 + name = "lxc-1.0.0.alpha1-92-g8111adf"; 5 7 6 8 src = fetchurl { 7 - url = "mirror://sourceforge/lxc/${name}.tar.gz"; 8 - sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy"; 9 + url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; 10 + sha256 = "05hjrn79wyjnm4ynf8y0j7pk2hwfrzp4dzwynxq4z2wxlc1ficd5"; 9 11 }; 10 12 11 - buildInputs = [ libcap apparmor perl docbook2x ]; 13 + buildInputs = [ libcap apparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; 12 14 13 - patches = [ 14 - ./dont-run-ldconfig.patch 15 - ./install-localstatedir-in-store.patch 16 - ./support-db2x.patch 17 - ]; 15 + patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; 18 16 19 17 preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; 20 18
-22
pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
··· 1 - diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.am lxc-0.9.0/src/lxc/Makefile.am 2 - --- lxc-0.9.0-orig/src/lxc/Makefile.am 2013-04-15 10:50:22.898102973 +0200 3 - +++ lxc-0.9.0/src/lxc/Makefile.am 2013-04-15 10:50:44.264862808 +0200 4 - @@ -193,7 +193,6 @@ 5 - mkdir -p $(DESTDIR)$(datadir)/lxc 6 - install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc 7 - mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) 8 - - /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) 9 - cd $(DESTDIR)$(libdir); \ 10 - ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ 11 - ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so 12 - diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.in lxc-0.9.0/src/lxc/Makefile.in 13 - --- lxc-0.9.0-orig/src/lxc/Makefile.in 2013-04-15 10:50:22.898102973 +0200 14 - +++ lxc-0.9.0/src/lxc/Makefile.in 2013-04-15 10:51:08.755810177 +0200 15 - @@ -1519,7 +1519,6 @@ 16 - mkdir -p $(DESTDIR)$(datadir)/lxc 17 - install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc 18 - mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) 19 - - /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) 20 - cd $(DESTDIR)$(libdir); \ 21 - ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ 22 - ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
+5 -18
pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch
··· 1 - diff -ubr lxc-0.9.0-orig/Makefile.am lxc-0.9.0/Makefile.am 2 - --- lxc-0.9.0-orig/Makefile.am 2013-04-15 10:50:22.899103057 +0200 3 - +++ lxc-0.9.0/Makefile.am 2013-04-15 10:58:41.189504254 +0200 4 - @@ -25,8 +25,8 @@ 1 + diff --git a/Makefile.am b/Makefile.am 2 + index eac2bfd..8f040d3 100644 3 + --- a/Makefile.am 4 + +++ b/Makefile.am 5 + @@ -25,8 +25,8 @@ pcdatadir = $(libdir)/pkgconfig 5 6 pcdata_DATA = lxc.pc 6 7 7 8 install-data-local: ··· 12 13 13 14 ChangeLog:: 14 15 @touch ChangeLog 15 - diff -ubr lxc-0.9.0-orig/Makefile.in lxc-0.9.0/Makefile.in 16 - --- lxc-0.9.0-orig/Makefile.in 2013-04-15 10:50:22.899103057 +0200 17 - +++ lxc-0.9.0/Makefile.in 2013-04-15 10:58:58.817870957 +0200 18 - @@ -805,8 +805,8 @@ 19 - 20 - 21 - install-data-local: 22 - - $(MKDIR_P) $(DESTDIR)$(LXCPATH) 23 - - $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc 24 - + $(MKDIR_P) $(out)$(LXCPATH) 25 - + $(MKDIR_P) $(out)$(localstatedir)/cache/lxc 26 - 27 - ChangeLog:: 28 - @touch ChangeLog
+14 -27
pkgs/os-specific/linux/lxc/support-db2x.patch
··· 1 - diff -ubr lxc-0.9.0-orig/configure lxc-0.9.0/configure 2 - --- lxc-0.9.0-orig/configure 2013-04-15 10:50:22.899103057 +0200 3 - +++ lxc-0.9.0/configure 2013-04-15 11:08:08.696539776 +0200 4 - @@ -4792,7 +4792,7 @@ 5 - 6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5 7 - $as_echo_n "checking for docbook2x-man... " >&6; } 8 - - for name in docbook2x-man db2x_docbook2man; do 9 - + for name in docbook2x-man db2x_docbook2man docbook2man; do 10 - if "$name" --help >/dev/null 2>&1; then 11 - db2xman="$name" 12 - break; 13 - @@ -8353,4 +8353,3 @@ 14 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 15 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} 1 + diff --git a/configure.ac b/configure.ac 2 + index 92a4690..4dd341b 100644 3 + --- a/configure.ac 4 + +++ b/configure.ac 5 + @@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then 6 + AC_SUBST(db2xman) 16 7 fi 17 - - 18 - diff -ubr lxc-0.9.0-orig/configure.ac lxc-0.9.0/configure.ac 19 - --- lxc-0.9.0-orig/configure.ac 2013-04-15 10:50:22.896102806 +0200 20 - +++ lxc-0.9.0/configure.ac 2013-04-15 11:07:52.399582819 +0200 21 - @@ -67,7 +67,7 @@ 22 - db2xman="" 8 + AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) 9 + -AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) 10 + +AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"]) 23 11 24 - AC_MSG_CHECKING(for docbook2x-man) 25 - - for name in docbook2x-man db2x_docbook2man; do 26 - + for name in docbook2x-man db2x_docbook2man docbook2man; do 27 - if "$name" --help >/dev/null 2>&1; then 28 - db2xman="$name" 29 - break; 12 + -if test "x$db2xman" = "xdocbook2man"; then 13 + +if test "x$db2xman" = "no-no-no"; then 14 + docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" 15 + else 16 + docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""