diff options
Diffstat (limited to 'pkgs/applications/virtualization')
6 files changed, 113 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh new file mode 100644 index 000000000000..36c381bececc --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/builder.sh @@ -0,0 +1,19 @@ + +source $stdenv/setup + +mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images + +cd $name +tar xf $src +make 8086tiny + +install 8086tiny $out/bin +install bios $out/share/$name/8086tiny-bios +install fd.img $out/share/$name/8086tiny-floppy.img +install bios_source/bios.asm $out/share/$name/8086tiny-bios-src.asmn +install docs/8086tiny.css $out/share/doc/$name +install docs/doc.html $out/share/doc/$name +for i in docs/images/*.gif +do + install $i $out/share/doc/$name/images +done diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix new file mode 100644 index 000000000000..0b4ff90e4095 --- /dev/null +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, localBios ? false, nasm ? null +, sdlSupport ? true, SDL ? null +}: + + +assert sdlSupport -> (SDL != null); + + +stdenv.mkDerivation rec { + + name = "8086tiny-${version}"; + version = "1.20"; + + src = fetchurl { + url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2"; + sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw"; + }; + + buildInputs = with stdenv.lib; + optionals localBios [ nasm ] + ++ optionals sdlSupport [ SDL ]; + + builder = ./builder.sh; + + meta = { + description = "An open-source 8086 emulator"; + longDescription = '' + 8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine. + + 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) + ''; + homepage = http://www.megalith.co.uk/8086tiny/index.html; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index e6d0b7cb40dd..54d697d42751 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { - name = "OVMF-2012-10-09"; + name = "OVMF-2014-02-01"; unpackPhase = '' for file in \ diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix new file mode 100644 index 000000000000..b718d89c8c77 --- /dev/null +++ b/pkgs/applications/virtualization/docker/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, iptables, lvm2 +, bash}: + +stdenv.mkDerivation rec { + name = "docker-${version}"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; + sha256 = "0anlzba2vm1fs5nf0dl2svrgj3ddsbl5iyhsm8vfbi3f23vppkfv"; + }; + + phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"]; + + buildInputs = [ makeWrapper go sqlite lxc iproute lvm2 iptables ]; + + preBuild = '' + patchShebangs ./hack + ''; + + buildPhase = '' + mkdir -p src/github.com/dotcloud + ln -sn "../../../" "src/github.com/dotcloud/docker" + export GOPATH="$(pwd):$(pwd)/vendor" + export DOCKER_GITCOMMIT="bc3b2ec0622f50879ae96f042056b6bd2e0b4fba" + export DOCKER_INITPATH="$out/libexec/docker/dockerinit" + ./hack/make.sh dynbinary + ''; + + installPhase = '' + install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker + install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit + wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:${lvm2}:sbin:${lxc}/bin:${iptables}/sbin" + + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + + # completion + install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker + install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + ''; + + meta = with stdenv.lib; { + homepage = http://www.docker.io/; + description = "An open source project to pack, ship and run any application as a lightweight container"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 2ce134090fe5..79a208fa54c5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.2.18"; # changes ./guest-additions as well + version = "4.2.22"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "88780"; + extpackRevision = "91556"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS - sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba"; + # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.22/SHA256SUMS + sha256 = "79c0da87451cab3868f64d48bf9a7fdd710786c05ed4b3070b008c3aa1ce4f7a"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74"; + sha256 = "4a017ec5fa0e0cfa830ae6c2b9d680c9b108e5fb96348e1397a7d0ea051f8bc1"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 805e0b867d97..595698abcaa5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767"; + sha256 = "222e003d038b757cd761361bb5da33123e0f9574af246fb95eb558593c8c7c76"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; |