diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/applications/virtualization | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/applications/virtualization')
5 files changed, 21 insertions, 16 deletions
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index e07f8d5b92c9..37086f52730f 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: -let version = "2.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "remotebox-${version}"; + version = "2.0"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; @@ -26,7 +26,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "VirtualBox client with remote management"; homepage = http://remotebox.knobgoblin.org.uk/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index abdbb46bc5b1..43228b255a24 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,15 +1,15 @@ -{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio -, fetchurl, fetchFromGitHub }: +{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools, + cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }: let coreosImageRelease = "794.1.0"; coreosImageSystemdVersion = "222"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" ]; + stage1Flavours = [ "coreos" "fly" "host" ]; in stdenv.mkDerivation rec { - version = "0.14.0"; + version = "0.15.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71"; + sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf"; }; stage1BaseImage = fetchurl { @@ -25,7 +25,10 @@ in stdenv.mkDerivation rec { sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym"; }; - buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; + buildInputs = [ + autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd + makeWrapper + ]; preConfigure = '' ./autogen.sh @@ -45,6 +48,9 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -Rv $BUILDDIR/bin/* $out/bin + wrapProgram $out/bin/rkt \ + --prefix LD_LIBRARY_PATH : ${systemd}/lib \ + --prefix PATH : ${iptables}/bin ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index cbdd00dc59c9..6f7609e85e28 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,7 +18,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.10"; + version = "5.0.12"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "104061"; + extpackRevision = "104815"; 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! - sha256 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c"; + sha256 = "ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d"; 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: @@ -63,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89"; + sha256 = "de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index a122e97f1148..15366fb1380f 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 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b"; + sha256 = "61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 5f4147ea2cfa..fcd7aab808b3 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -5,7 +5,7 @@ , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt -, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools +, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , inetutils, iptables, openvswitch, nbd, drbd, xenConfig , xenserverPatched ? false, ... }: @@ -51,7 +51,7 @@ let ]; scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") - [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools + [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools iproute inetutils iptables bridge-utils openvswitch nbd drbd ])); in |