mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
svn merge nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=29497
This commit is contained in:
Yury G. Kudryashov
commit
63b48b0b30
11 changed files with 439 additions and 42 deletions
49
pkgs/applications/virtualization/lxc/default.nix
Normal file
49
pkgs/applications/virtualization/lxc/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }:
|
||||
|
||||
let
|
||||
name = "lxc-0.7.5";
|
||||
in
|
||||
stdenv.mkDerivation{
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
|
||||
sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap perl docbook2x ];
|
||||
|
||||
patches = [
|
||||
./dont-run-ldconfig.patch
|
||||
./fix-documentation-build.patch
|
||||
./fix-sgml-documentation.patch
|
||||
];
|
||||
|
||||
preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
|
||||
|
||||
configureFlags = "--localstatedir=/var";
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/lib"
|
||||
lib=liblxc.so.?.*
|
||||
ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://lxc.sourceforge.net";
|
||||
description = "lightweight virtual system mechanism";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
|
||||
longDescription = ''
|
||||
LXC is the userspace control package for Linux Containers, a
|
||||
lightweight virtual system mechanism sometimes described as
|
||||
"chroot on steroids". LXC builds up from chroot to implement
|
||||
complete virtual systems, adding resource management and isolation
|
||||
mechanisms to Linux’s existing process management infrastructure.
|
||||
'';
|
||||
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
24
pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch
Normal file
24
pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am
|
||||
--- lxc-0.7.5-orig/src/lxc/Makefile.am 2011-07-25 00:27:10.000000000 +0200
|
||||
+++ lxc-0.7.5/src/lxc/Makefile.am 2011-09-26 09:58:03.479916848 +0200
|
||||
@@ -115,7 +115,7 @@
|
||||
|
||||
install-exec-local: install-soPROGRAMS
|
||||
mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
|
||||
- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
|
||||
+ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
|
||||
cd $(DESTDIR)$(libdir); \
|
||||
ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
|
||||
|
||||
diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in
|
||||
--- lxc-0.7.5-orig/src/lxc/Makefile.in 2011-08-11 19:02:19.000000000 +0200
|
||||
+++ lxc-0.7.5/src/lxc/Makefile.in 2011-09-26 09:58:18.812685181 +0200
|
||||
@@ -1322,7 +1322,7 @@
|
||||
|
||||
install-exec-local: install-soPROGRAMS
|
||||
mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
|
||||
- /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
|
||||
+ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION)
|
||||
cd $(DESTDIR)$(libdir); \
|
||||
ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am lxc-0.7.5/doc/Makefile.am
|
||||
--- lxc-0.7.5-orig/doc/Makefile.am 2011-02-14 09:14:07.000000000 +0100
|
||||
+++ lxc-0.7.5/doc/Makefile.am 2011-09-26 09:53:02.192817940 +0200
|
||||
@@ -30,13 +30,13 @@
|
||||
|
||||
|
||||
%.1 : %.sgml
|
||||
- docbook2man -w all $<
|
||||
+ docbook2man $<
|
||||
|
||||
%.5 : %.sgml
|
||||
- docbook2man -w all $<
|
||||
+ docbook2man $<
|
||||
|
||||
%.7 : %.sgml
|
||||
- docbook2man -w all $<
|
||||
+ docbook2man $<
|
||||
|
||||
lxc-%.sgml : common_options.sgml see_also.sgml
|
||||
|
||||
diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in lxc-0.7.5/doc/Makefile.in
|
||||
--- lxc-0.7.5-orig/doc/Makefile.in 2011-08-11 19:02:18.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/Makefile.in 2011-09-26 09:53:13.835401448 +0200
|
||||
@@ -786,13 +786,13 @@
|
||||
|
||||
|
||||
@ENABLE_DOCBOOK_TRUE@%.1 : %.sgml
|
||||
-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $<
|
||||
+@ENABLE_DOCBOOK_TRUE@ docbook2man $<
|
||||
|
||||
@ENABLE_DOCBOOK_TRUE@%.5 : %.sgml
|
||||
-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $<
|
||||
+@ENABLE_DOCBOOK_TRUE@ docbook2man $<
|
||||
|
||||
@ENABLE_DOCBOOK_TRUE@%.7 : %.sgml
|
||||
-@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $<
|
||||
+@ENABLE_DOCBOOK_TRUE@ docbook2man $<
|
||||
|
||||
@ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml
|
||||
|
||||
|
|
@ -0,0 +1,252 @@
|
|||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/doc/lxc-cgroup.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-cgroup.sgml.in 2011-09-26 10:05:01.753873426 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.7.5/doc/lxc-checkpoint.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in 2011-02-17 10:07:44.000000000 +0100
|
||||
+++ lxc-0.7.5/doc/lxc-checkpoint.sgml.in 2011-09-26 10:05:01.753873426 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/doc/lxc.conf.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc.conf.sgml.in 2011-08-09 16:51:01.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc.conf.sgml.in 2011-09-26 10:05:01.754873476 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
]>
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5/doc/lxc-console.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-console.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-console.sgml.in 2011-09-26 10:05:01.754873476 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/doc/lxc-create.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-create.sgml.in 2011-07-25 00:27:10.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-create.sgml.in 2011-09-26 10:05:01.755873526 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5/doc/lxc-destroy.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-destroy.sgml.in 2010-10-08 11:54:53.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-destroy.sgml.in 2011-09-26 10:05:01.755873526 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5/doc/lxc-execute.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-execute.sgml.in 2011-07-25 00:27:10.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-execute.sgml.in 2011-09-26 10:05:01.755873526 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/doc/lxc-freeze.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-freeze.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-freeze.sgml.in 2011-09-26 10:05:01.755873526 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/doc/lxc-kill.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-kill.sgml.in 2010-10-08 11:54:53.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-kill.sgml.in 2011-09-26 10:05:01.756873576 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/lxc-ls.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-ls.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-ls.sgml.in 2011-09-26 10:05:01.756873576 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
]>
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5/doc/lxc-monitor.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-monitor.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-monitor.sgml.in 2011-09-26 10:05:01.756873576 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/lxc-ps.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-ps.sgml.in 2011-08-11 17:54:57.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-ps.sgml.in 2011-09-26 10:05:01.756873576 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
]>
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5/doc/lxc-restart.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-restart.sgml.in 2011-02-17 10:07:44.000000000 +0100
|
||||
+++ lxc-0.7.5/doc/lxc-restart.sgml.in 2011-09-26 10:05:01.757873626 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc.sgml.in 2010-10-26 18:07:35.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc.sgml.in 2011-09-26 10:05:01.758873676 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
]>
|
||||
@@ -280,7 +280,7 @@
|
||||
</para>
|
||||
|
||||
<programlisting>
|
||||
-
|
||||
+<![CDATA[
|
||||
---------
|
||||
| STOPPED |<---------------
|
||||
--------- |
|
||||
@@ -305,7 +305,7 @@
|
||||
---------- |
|
||||
| |
|
||||
---------------------
|
||||
-
|
||||
+]]>
|
||||
</programlisting>
|
||||
</refsect2>
|
||||
|
||||
@@ -570,7 +570,7 @@
|
||||
to the background.
|
||||
|
||||
<programlisting>
|
||||
-
|
||||
+<![CDATA[
|
||||
# launch lxc-wait in background
|
||||
lxc-wait -n foo -s STOPPED &
|
||||
LXC_WAIT_PID=$!
|
||||
@@ -583,7 +583,7 @@
|
||||
# is STOPPED
|
||||
wait $LXC_WAIT_PID
|
||||
echo "'foo' is finished"
|
||||
-
|
||||
+]]>
|
||||
</programlisting>
|
||||
</para>
|
||||
</refsect2>
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/doc/lxc-start.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-start.sgml.in 2011-02-01 15:12:40.000000000 +0100
|
||||
+++ lxc-0.7.5/doc/lxc-start.sgml.in 2011-09-26 10:05:01.758873676 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/doc/lxc-stop.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-stop.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-stop.sgml.in 2011-09-26 10:05:01.758873676 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in lxc-0.7.5/doc/lxc-unfreeze.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-unfreeze.sgml.in 2011-09-26 10:05:01.759873726 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-wait.sgml.in lxc-0.7.5/doc/lxc-wait.sgml.in
|
||||
--- lxc-0.7.5-orig/doc/lxc-wait.sgml.in 2010-06-07 10:51:51.000000000 +0200
|
||||
+++ lxc-0.7.5/doc/lxc-wait.sgml.in 2011-09-26 10:05:01.759873726 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
-->
|
||||
|
||||
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
|
||||
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
||||
|
||||
<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
|
||||
<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
, gobjectSupport ? true, glib
|
||||
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
|
||||
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
|
||||
, gettext
|
||||
}:
|
||||
|
||||
assert postscriptSupport -> zlib != null;
|
||||
|
|
@ -22,7 +23,10 @@ stdenv.mkDerivation rec {
|
|||
buildInputs =
|
||||
[ pkgconfig x11 fontconfig pixman xlibs.libXrender ]
|
||||
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
|
||||
++ stdenv.lib.optional gobjectSupport glib;
|
||||
++ stdenv.lib.optional gobjectSupport glib
|
||||
|
||||
# On non-GNU systems we need GNU Gettext for libintl.
|
||||
++ stdenv.lib.optional (!stdenv.isLinux) gettext;
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ freetype ] ++
|
||||
|
|
@ -62,5 +66,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://cairographics.org/;
|
||||
|
||||
licenses = [ "LGPLv2+" "MPLv1" ];
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
{ stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "imlib2-1.4.4";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "imlib2-1.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/enlightenment/imlib2-1.4.4.tar.gz;
|
||||
sha256 = "163162aifak8ya17brzqwjlr8ywz40s2s3573js5blcc1g4m5pm4";
|
||||
url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
|
||||
sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14";
|
||||
};
|
||||
|
||||
buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 pkgconfig ];
|
||||
buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
|
||||
meta = {
|
||||
platforms = stdenv.lib.platforms.gnu; # random choice
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = "automake-1.11.1";
|
||||
|
||||
# TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
|
||||
# available upstream; see
|
||||
# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
|
||||
builder = ./builder.sh;
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
|
|
|||
48
pkgs/tools/networking/altermime/altermime.patch
Normal file
48
pkgs/tools/networking/altermime/altermime.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
AUR patch for fixing build
|
||||
|
||||
diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c
|
||||
--- altermime-0.3.10/qpe.c 2008-11-16 09:45:45.000000000 +0100
|
||||
+++ altermime-0.3.10-new/qpe.c 2010-11-24 14:28:43.153334114 +0100
|
||||
@@ -97,7 +97,7 @@
|
||||
op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/
|
||||
out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems
|
||||
|
||||
- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
|
||||
+ QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
|
||||
|
||||
/** reinitialize the paragraph **/
|
||||
paragraph[0] = '\0';
|
||||
@@ -108,7 +108,7 @@
|
||||
}
|
||||
|
||||
snprintf(pp, pp_remaining, "%s", charout);
|
||||
- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph);
|
||||
+ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph);
|
||||
pp += charout_size;
|
||||
pp_remaining -= charout_size;
|
||||
p++;
|
||||
@@ -149,13 +149,13 @@
|
||||
out_size = in_size *3;
|
||||
in_buffer = malloc( sizeof(char) *in_size +1);
|
||||
if (in_buffer == NULL) {
|
||||
- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size);
|
||||
+ QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size);
|
||||
return -1;
|
||||
}
|
||||
|
||||
out_buffer = malloc( sizeof(char) *out_size *3 +1);
|
||||
if (in_buffer == NULL) {
|
||||
- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size);
|
||||
+ QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
** we segfault ;) **/
|
||||
*(in_buffer +in_size) = '\0';
|
||||
|
||||
- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size);
|
||||
+ QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size);
|
||||
|
||||
qp_encode( out_buffer, out_size, in_buffer, in_size );
|
||||
|
||||
|
|
@ -26,7 +26,9 @@ rec {
|
|||
inherit (sourceInfo) name version;
|
||||
inherit buildInputs;
|
||||
|
||||
phaseNames = ["fixTarget" "doMakeInstall"];
|
||||
patches = [./altermime.patch];
|
||||
|
||||
phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
|
||||
fixTarget = a.fullDepEntry (''
|
||||
sed -i Makefile -e "s@/usr/local@$out@"
|
||||
ensureDir "$out/bin"
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
{ stdenv, fetchurl, libcap, perl }:
|
||||
|
||||
let
|
||||
name = "lxc-0.7.5";
|
||||
in
|
||||
stdenv.mkDerivation{
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
|
||||
sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap perl ];
|
||||
|
||||
patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in";
|
||||
|
||||
configureFlags = "--localstatedir=/var";
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/lib"
|
||||
lib=liblxc.so.?.*
|
||||
ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://lxc.sourceforge.net;
|
||||
description = "lxc Linux Containers userland tools";
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
}
|
||||
|
|
@ -446,7 +446,7 @@ let
|
|||
gui = true;
|
||||
};
|
||||
|
||||
bittornado = callPackage ../tools/networking/p2p/bit-tornado {
|
||||
bittornado = callPackage ../tools/networking/p2p/bit-tornado {
|
||||
inherit (pythonPackages) ssl;
|
||||
};
|
||||
|
||||
|
|
@ -915,7 +915,7 @@ let
|
|||
|
||||
lshw = callPackage ../tools/system/lshw { };
|
||||
|
||||
lxc = callPackage ../tools/system/lxc { };
|
||||
lxc = callPackage ../applications/virtualization/lxc { };
|
||||
|
||||
lzma = xz;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue