diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
| commit | 81039713fad72bcfb6d29e358866344c254096c2 (patch) | |
| tree | 5150eb44e296607c43c5c7ece21249d0e39ff098 /pkgs/applications/virtualization | |
| parent | 21df05d1ad9ad8b3e8138138f65525d2e6324341 (diff) | |
| parent | 8fbdb40ef0ce39e6605db3dfd223402636de8907 (diff) | |
| download | nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.gz nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.bz2 nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.lz nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.xz nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.zst nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.zip | |
Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9be979057dc..6260de54594 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -2,7 +2,6 @@ , go, sqlite, iproute, bridge-utils, devicemapper , btrfs-progs, iptables, e2fsprogs, xz, utillinux , systemd, pkgconfig -, enableLxc ? false, lxc }: # https://github.com/docker/docker/blob/master/project/PACKAGERS.md @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}" + --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 06d75a00b97..ed59f5eb510 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -15,7 +15,7 @@ with stdenv.lib; let - version = "2.5.1"; + version = "2.6.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "0b2xa8604absdmzpcyjs7fix19y5blqmgflnwjzsp1mp7g1m51q2"; + sha256 = "1v1lhhd6m59hqgmiz100g779rjq70pik5v4b3g936ci73djlmb69"; }; buildInputs = |