diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization')
12 files changed, 93 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index 36e52ff1e46..be6196855e2 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -4,17 +4,18 @@ , glib , glibc , systemd +, nixosTests }: stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.16"; + version = "2.0.17"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0z0hds95mjxm703ig2aisghvpd2l3wn6m72jnnlv8jnz2iq2nc4g"; + sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7"; }; nativeBuildInputs = [ pkg-config ]; @@ -23,6 +24,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix new file mode 100644 index 00000000000..1578eaf4f58 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -0,0 +1,53 @@ +{ cri-o-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, cri-o +, runc # Default container runtime +, crun # Container runtime (default with cgroups v2 for podman/buildah) +, conmon # Container runtime monitor +, utillinux # nsenter +, cni-plugins # not added to path +, iptables +, socat +}: + +let + cri-o = cri-o-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + utillinux + iptables + socat + ] ++ extraPackages); + +in runCommand cri-o.name { + name = "${cri-o.pname}-wrapper-${cri-o.version}"; + inherit (cri-o) pname version; + + meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + ln -s ${cri-o.man} $man + + mkdir -p $out/bin + ln -s ${cri-o-unwrapped}/share $out/share + + for p in ${cri-o-unwrapped}/bin/*; do + makeWrapper $p $out/bin/''${p##*/} \ + --prefix PATH : ${binPath} + done +'' diff --git a/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/nixpkgs/pkgs/applications/virtualization/crun/default.nix index ded793449fc..a11d5d356d1 100644 --- a/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -9,6 +9,7 @@ , python3 , systemd , yajl +, nixosTests }: let @@ -62,6 +63,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.podman = nixosTests.podman; + meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 14c5ec0a416..71359467c5c 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -1,4 +1,5 @@ { stdenv, buildPythonApplication, fetchPypi, pythonOlder +, installShellFiles , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests @@ -17,6 +18,7 @@ buildPythonApplication rec { # lots of networking and other fails doCheck = false; + nativeBuildInputs = [ installShellFiles ]; checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker @@ -33,11 +35,8 @@ buildPythonApplication rec { ''; postInstall = '' - install -D -m 0444 contrib/completion/bash/docker-compose \ - $out/share/bash-completion/completions/docker-compose - - install -D -m 0444 contrib/completion/zsh/_docker-compose \ - $out/share/zsh-completion/zsh/site-functions/_docker-compose + installShellCompletion --bash contrib/completion/bash/docker-compose + installShellCompletion --zsh contrib/completion/zsh/_docker-compose ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index f7c49526fb1..da414cd5546 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -197,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.8"; - rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3"; - sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j"; + version = "19.03.11"; + rev = "42e35e61f352e527082521280d5ea3761f0dee50"; + sha256 = "0q4l4z2bg269hj1dqaq02f84zgp3p8idw1cxczw383cjl0ra8xgq"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 diff --git a/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix index 7d62b1b9fa2..74a408952a2 100644 --- a/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "0r11kbyp1ambgcj35gvjjmxrsrdg7b9jb9sq3kih4lik7zyljp25"; + sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v"; }; buildAttrs = { diff --git a/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix index 31755f87f63..de3d944bacb 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, podman, pyyaml }: +{ lib, buildPythonApplication, fetchPypi, pyyaml }: buildPythonApplication rec { version = "0.1.5"; @@ -9,13 +9,13 @@ buildPythonApplication rec { sha256 = "1sgbc889zq127qhxa9frhswa1mid19fs5qnyzfihx648y5i968pv"; }; - propagatedBuildInputs = [ pyyaml podman ]; + propagatedBuildInputs = [ pyyaml ]; - meta = with lib; { + meta = { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index e88e0a60c5e..3ed029e55fb 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2"; + sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; }; vendorSha256 = null; @@ -45,7 +45,7 @@ buildGoModule rec { patchShebangs . ${if stdenv.isDarwin then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" - else "make binaries docs"} + else "make podman docs"} ''; installPhase = '' diff --git a/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix index d7fb6fa1072..d97d182496a 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix @@ -5,12 +5,12 @@ , extraPackages ? [] , podman # Docker compat , runc # Default container runtime -, crun # Default container runtime (cgroups v2) +, crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs , utillinux # nsenter -, cni-plugins +, cni-plugins # not added to path , iptables }: diff --git a/nixpkgs/pkgs/applications/virtualization/qboot/default.nix b/nixpkgs/pkgs/applications/virtualization/qboot/default.nix index d770308239f..800d601c76e 100644 --- a/nixpkgs/pkgs/applications/virtualization/qboot/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qboot/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, meson, ninja, fetchFromGitHub }: stdenv.mkDerivation { - name = "qboot-20170330"; + name = "qboot-20200423"; src = fetchFromGitHub { owner = "bonzini"; repo = "qboot"; - rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; - sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; + rev = "de50b5931c08f5fba7039ddccfb249a5b3b0b18d"; + sha256 = "1d0h29zz535m0pq18k3aya93q7lqm2858mlcp8mlfkbq54n8c5d8"; }; + nativeBuildInputs = [ meson ninja ]; + installPhase = '' mkdir -p $out - cp bios.bin* $out/. + cp bios.bin bios.bin.elf $out/. ''; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 1bf6b3d574a..58c3ef4f61b 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -9,11 +9,12 @@ , apparmor-parser , libseccomp , libselinux +, nixosTests }: buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc10"; + version = "1.0.0-rc90"; src = fetchFromGitHub { owner = "opencontainers"; @@ -45,6 +46,8 @@ buildGoPackage rec { installManPage man/*/*.[1-9] ''; + passthru.tests.podman = nixosTests.podman; + meta = with lib; { homepage = "https://github.com/opencontainers/runc"; description = "A CLI tool for spawning and running containers according to the OCI specification"; diff --git a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 7ef91e6f609..cbaa0a57992 100644 --- a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0p1ypgy45ngxxjczd986pkfh4cn5bs45cwzlfv9fm2p58fkx3aar"; + sha256 = "1skdgr2hipd7yx9c7r7nr3914gm9cm1xj6h3qdsa9f92xxm3aml1"; }; nativeBuildInputs = [ makeWrapper ]; |