diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
commit | 2aa6f262cbb2052d604874223549ca44fd448a67 (patch) | |
tree | 6a70e96bb9d87365f4bcbf8c58025a0d93c96078 /pkgs/applications/virtualization | |
parent | f9e75352cf610360d43806bb09671d013c881cc9 (diff) | |
parent | 1a52c7659dda87a8186d2a5482e49170b3989afa (diff) | |
download | nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.gz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.bz2 nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.lz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.xz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.zst nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/qemu/0.15.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/virtualization/qemu/1.0.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virtinst/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 2 |
5 files changed, 25 insertions, 41 deletions
diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix deleted file mode 100644 index f75b21292430..000000000000 --- a/pkgs/applications/virtualization/qemu/0.15.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-0.15.1"; - - src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.gz"; - sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp"; - }; - - buildInputs = [ python zlib pkgconfig glib SDL ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/1.0.nix b/pkgs/applications/virtualization/qemu/1.0.nix deleted file mode 100644 index daa0b74ee329..000000000000 --- a/pkgs/applications/virtualization/qemu/1.0.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-1.0.1"; - - src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.gz"; - sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r"; - }; - - buildInputs = [ python zlib pkgconfig glib SDL ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix new file mode 100644 index 000000000000..fabe3fed47df --- /dev/null +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }: + +stdenv.mkDerivation rec { + name = "qemu-1.3.1"; + + src = fetchurl { + url = "http://wiki.qemu.org/download/${name}.tar.bz2"; + sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip"; + }; + + buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ]; + + enableParallelBuilding = true; + + meta = { + description = "QEmu processor emulator"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [ viric shlevy ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 2bb2adaa00ac..26b16375e659 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python + libvirt libxml2Python urlgrabber ]; buildInputs = @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { buildPhase = "python setup.py build"; installPhase = - '' + '' python setup.py install --prefix="$out"; + wrapPythonPrograms ''; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f699119c5f04..ea98d1ce7a9d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -121,7 +121,7 @@ in stdenv.mkDerivation { --base-dir "$libexec/ExtensionPacks" \ --cert-dir "$libexec/ExtPackCertificates" \ --name "Oracle VM VirtualBox Extension Pack" \ - --tarball "${extensionPack}" + --tarball "${extensionPack}" \ --sha-256 "${extensionPack.outputHash}" ''} |