diff options
Diffstat (limited to 'pkgs/applications/virtualization')
7 files changed, 41 insertions, 373 deletions
diff --git a/pkgs/applications/virtualization/lxc/default.nix b/pkgs/applications/virtualization/lxc/default.nix deleted file mode 100644 index 26180b84368..00000000000 --- a/pkgs/applications/virtualization/lxc/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ 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 ]; - }; -} diff --git a/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch b/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch deleted file mode 100644 index e72ac0250f5..00000000000 --- a/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - diff --git a/pkgs/applications/virtualization/lxc/fix-documentation-build.patch b/pkgs/applications/virtualization/lxc/fix-documentation-build.patch deleted file mode 100644 index 0189b35a33e..00000000000 --- a/pkgs/applications/virtualization/lxc/fix-documentation-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - diff --git a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch b/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch deleted file mode 100644 index 4d2cce0dd62..00000000000 --- a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch +++ /dev/null @@ -1,252 +0,0 @@ -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"> diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ba01d8c4d41..a8594c4ba16 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - version = "4.2.0"; + version = "4.2.2"; forEachModule = action: '' for mod in \ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6"; + sha256 = "943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700"; }; buildInputs = @@ -44,7 +44,9 @@ in stdenv.mkDerivation { ++ optional javaBindings jdk ++ optional pythonBindings python; - patchPhase = '' + patches = [ ./remove_fa_ir.patch ]; + + postPatch = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 63939cc5e65..c4c7a9f2708 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.2.0"; in +let version = "4.2.2"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; + src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3"; + sha256 = "26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1"; }; + KERN_DIR = "${kernel}/lib/modules/*/build"; + buildInputs = [ patchelf cdrkit makeWrapper ]; installPhase = '' @@ -101,9 +104,7 @@ stdenv.mkDerivation { # Install Xorg drivers mkdir -p $out/lib/xorg/modules/{drivers,input} - install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so - # There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever? - #install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so + install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_112.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # Install kernel modules cd src diff --git a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch new file mode 100644 index 00000000000..0d7a8342192 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch @@ -0,0 +1,30 @@ +This patch is for VirtualBox-4.2.2, to temporarily remove references to the +fa_IR language file from the source tree, as it somehow got lost during tarball +creation. For more information on this subject please have a look at: + +https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html + +diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro +index ffeb410..37ac56a 100644 +--- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro ++++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro +@@ -63,7 +63,6 @@ TRANSLATIONS = \ + nls/VirtualBox_es.ts \ + nls/VirtualBox_eu.ts \ + nls/VirtualBox_fi.ts \ +- nls/VirtualBox_fa_IR.ts \ + nls/VirtualBox_fr.ts \ + nls/VirtualBox_gl_ES.ts \ + nls/VirtualBox_hu.ts \ +diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk +index 66f0ec3..2fc19b9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk ++++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk +@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \ + de \ + en \ + es \ +- fa_IR \ + hu \ + it \ + ja \ |