diff options
Diffstat (limited to 'pkgs/applications/virtualization')
6 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3854c577188f..46d03ad3d622 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8"; + sha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1a2c850f1569..7e9a89d48887 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, bridge-utils, devicemapper, systemd +, sqlite, iproute, bridge-utils, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps, libseccomp }: @@ -66,7 +66,7 @@ rec { DOCKER_BUILDTAGS = [] ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" + ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }) // rec { @@ -88,7 +88,7 @@ rec { buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ - sqlite devicemapper btrfs-progs systemd libseccomp + sqlite lvm2 btrfs-progs systemd libseccomp ]; dontStrip = true; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index b6f4a5976e44..ff05cb757066 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.5.1"; + version = "2.5.2"; enableParallelBuilding = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d"; + sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 883cd1c867a1..e7ab3aa251cf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "4c36d129f17dcab2bb37292022f1b1adfefa5f32a3161b0d5d40784bc8acf4d0"; - extpackRev = "122591"; - main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s"; - version = "5.2.12"; + extpack = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e"; + extpackRev = "123301"; + main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644"; + version = "5.2.14"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6ea0333936b2..dcc58b04c8e3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046"; + sha256 = "e149ff0876242204fe924763f9272f691242d6a6ad4538a128fb7dba770781de"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index bb6209ce47fb..64704f73e7b1 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -1,5 +1,5 @@ { stdenv, callPackage, fetchurl, fetchpatch, fetchgit -, ocamlPackages_4_02 +, ocaml-ng , withInternalQemu ? true , withInternalTraditionalQemu ? true , withInternalSeabios ? true @@ -258,4 +258,4 @@ callPackage (import ./generic.nix (rec { else throw "this xen has no qemu builtin"; }; -})) ({ ocamlPackages = ocamlPackages_4_02; } // args) +})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args) |