diff options
Diffstat (limited to 'pkgs/applications/virtualization')
18 files changed, 60 insertions, 42 deletions
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 3e70bd390e16..ed9aa2116b51 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -5,18 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "121.3"; + version = "122.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "1e7125327a29b7b7a0593caf339d382728c55cf6"; - sha256 = "Rjs46TtOhFZxqnEyqa4IyrRs7HnDZ/DJZ9DPEe7Oux0="; + rev = "562d81eb28a49ed6e0d771a430c21a458cdd33f9"; + sha256 = "l5sIUInOhhkn3ernQLIEwEpRCyICDH/1k4C/aidy1/I="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-7nfeg/q8baLvB0CoRWKU60TRfLAaRkeRxGojPvKpOLs="; + cargoHash = "sha256-2MaRfQCAjW560sdAPqdWymClwY1U5QjIMzknHry+9zs="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner @@ -30,9 +30,10 @@ rustPlatform.buildRustPackage rec { patchShebangs third_party/minijail/tools/*.py ''; + CROSVM_USE_SYSTEM_MINIGBM = true; CROSVM_USE_SYSTEM_VIRGLRENDERER = true; - buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ]; + buildFeatures = [ "virgl_renderer" ]; passthru.updateScript = ./update.py; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 000bb6ee4bcd..de13fcf5ea1e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-R4+MVC8G4wNwjZtBnLFq+TBiesUYACg9c5y2CUcqHHQ="; + hash = "sha256-mesFwYgDCZ44/EJ31mzx9yLeMyV2bXpxaNSx6L3BQG0="; }; doCheck = false; @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Docker CLI plugin for extended build capabilities with BuildKit"; + mainProgram = "docker-buildx"; homepage = "https://github.com/docker/buildx"; license = licenses.asl20; maintainers = with maintainers; [ ivan-babrou developer-guy ]; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index d679d674411c..f1aecbf50adc 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.24.7"; + version = "2.26.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-r7V9ZqUbtK4PG/NfDTbDljP+xaPJBXZSp1rGY/kgUTA="; + hash = "sha256-hOBWtvls4rRYPMTvkTRkEAftzQB6SG1bv9vasK54d/4="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-Ec2JRCQvdC2VzkK29GyKS2DTrfHgv4wJc/50fbLVKEY="; + vendorHash = "sha256-uyGGzfsfjk0mUoJ/0Sm89Mus2fQS3HZGBAQ48xMecwU="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Docker CLI plugin to define and run multi-container applications with Docker"; + mainProgram = "docker-compose"; homepage = "https://github.com/docker/compose"; license = licenses.asl20; maintainers = with maintainers; [ babariviere ]; diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index 54e0d737bf2d..f19d015e9e30 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -42,6 +42,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://docs.docker.com/compose/"; description = "Multi-container orchestration for Docker"; + mainProgram = "docker-compose"; license = licenses.asl20; maintainers = with maintainers; [ Frostman ]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9b6bb0a48be3..a82a00fd5412 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -279,20 +279,6 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* - docker_20_10 = callPackage dockerGen rec { - version = "20.10.26"; - cliRev = "v${version}"; - cliHash = "sha256-EPhsng0kLnweVbC8ZnH0NK1/yHlYSA5Sred4rWJX/Gs="; - mobyRev = "v${version}"; - mobyHash = "sha256-IJ7m2mQnsLiom0EuZLpuLY6fYEko7rEy35igJv1AY04="; - runcRev = "v1.1.8"; - runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4="; - containerdRev = "v1.6.22"; - containerdHash = "sha256-In7OkK3xm7Cz3H1jzG9b4tsZbmo44QCq8pNU+PPy8dY="; - tiniRev = "v0.19.0"; - tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; - }; - docker_24 = callPackage dockerGen rec { version = "24.0.5"; cliRev = "v${version}"; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 0736516ee7d2..7d45427627fa 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Docker garbage collection of containers and images"; + mainProgram = "docker-gc"; license = licenses.asl20; homepage = "https://github.com/spotify/docker-gc"; maintainers = with maintainers; [offline]; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 6038a129e2a1..e4f543524764 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -19,6 +19,7 @@ buildGoPackage rec { meta = with lib; { description = "Docker proxy binary to forward traffic between host and containers"; + mainProgram = "docker-proxy"; license = licenses.asl20; homepage = "https://github.com/docker/libnetwork"; maintainers = with maintainers; [vdemeester]; diff --git a/pkgs/applications/virtualization/docker/sbom.nix b/pkgs/applications/virtualization/docker/sbom.nix index 7314eb2029fd..9ab81509b694 100644 --- a/pkgs/applications/virtualization/docker/sbom.nix +++ b/pkgs/applications/virtualization/docker/sbom.nix @@ -36,6 +36,7 @@ buildGoModule rec { meta = with lib; { description = "Plugin for Docker CLI to support SBOM creation using Syft"; + mainProgram = "docker-sbom"; homepage = "https://github.com/docker/sbom-cli-plugin"; license = licenses.asl20; maintainers = with maintainers; [ raboof ]; diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index 25adabdba0a6..bb703e3a0ac6 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-EStyi6RDK1G6kuaDGumZaHB4OrSrhhx/F5GsLe0amyA="; + hash = "sha256-81jfoWHYYenGQFcQI9kk8uPnv6FcyOtcJjpo1ykdtOI="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index ae6e6d19ee79..a74027650960 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "lima"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MeTFATaAGRSaUXmC1fv9/gMFWafvkteKVJS6MHaqt8A="; + sha256 = "sha256-xFiCGuCUJUnWN5DBfwjhBgntDfod4CWpXqJ3dbrDUSQ="; }; vendorHash = "sha256-wd7YiEo4Gy2kHF7aCRoNGlbOQUxqQnKqP3znzMqS2PI="; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index f48a4394f7b3..d6d80461c674 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-nPSUpGLSuIZMzgvmZtCZ3nqT5b1+0VkCmzPnUMLYkss="; + hash = "sha256-T2hiCRoZqdbcB36Tpy597j7Hc1yeR2MijQbuheENfuA="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 30a259d12540..b3ea9bd94a92 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -155,5 +155,6 @@ buildGoModule rec { changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; + mainProgram = "podman"; }; } diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix index b6eaea8d7597..718446d1ce1f 100644 --- a/pkgs/applications/virtualization/rvvm/default.nix +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -1,21 +1,45 @@ -{ lib, stdenv, fetchFromGitHub, SDL_compat, libX11, libXext }: +{ lib +, stdenv +, fetchFromGitHub + +, SDL2 + +, libX11 +, libXext + +, guiBackend ? "sdl" + +, enableSDL ? guiBackend == "sdl" +, enableX11 ? guiBackend == "x11" +}: + +assert lib.assertMsg (builtins.elem guiBackend ["sdl" "x11" "none"]) "Unsupported GUI backend"; +assert lib.assertMsg (!(enableSDL && enableX11)) "RVVM can have only one GUI backend at a time"; +assert lib.assertMsg (stdenv.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; stdenv.mkDerivation rec { pname = "rvvm"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "LekKit"; repo = "RVVM"; rev = "v${version}"; - sha256 = "sha256-1wAKijRYB0FGBe4cSHUynkO4ePVG4QvVIgSoWzNbqtE="; + sha256 = "sha256-5nSlKyWDAx0EeKFzzwP5+99XuJz9BHXEF1WNkRMLa9U="; }; - buildInputs = if stdenv.isDarwin then [ SDL_compat ] else [ libX11 libXext ]; + buildInputs = [] + ++ lib.optionals enableSDL [ SDL2 ] + ++ lib.optionals enableX11 [ libX11 libXext ]; + + enableParallelBuilding = true; buildFlags = [ "all" "lib" ]; makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1 + ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0" + # work around https://github.com/NixOS/nixpkgs/issues/19098 ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; @@ -24,7 +48,7 @@ stdenv.mkDerivation rec { description = "The RISC-V Virtual Machine"; license = with licenses; [ gpl3 /* or */ mpl20 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kamillaova ]; mainProgram = "rvvm"; }; } diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 85992e2abce9..d16b88adece3 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -300,7 +300,7 @@ in let unwrapped = writeShellScriptBin "apptainer-cuda-saxpy" '' - ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.tests.image-saxpy} saxpy + ${lib.getExe finalAttrs.finalPackage} exec --nv $@ ${finalAttrs.passthru.gpuChecks.image-saxpy} saxpy ''; in runCommand "run-apptainer-cuda-saxpy" diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 933bc4efa424..efa77b4209f3 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -7,20 +7,20 @@ let apptainer = callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.2.5"; + version = "1.3.0"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-1XuqyNXyYrmIfqp8450z8+qET15hKVfj2v2iN9QPmDk="; + hash = "sha256-YqPPTs7cIiMbOc8jOwr8KgUBVu2pTPlSL0Vvw/1n4co="; }; # Update by running # nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository - vendorHash = "sha256-Y0gOqg+WGgssXGEYHc9IFwiIpkb3hetlQI89vseAQPc="; + vendorHash = "sha256-lWo6ic3Tdv1UInA5MtEaAgiheCin2JSh4nmheUooENY="; extraDescription = " (previously known as Singularity)"; extraMeta.homepage = "https://apptainer.org"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f226a32596d3..df2094c3b1fc 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -281,7 +281,7 @@ in stdenv.mkDerivation { ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 1831d42a129e..fad5aa6e10fb 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -19,7 +19,7 @@ fetchurl rec { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander friedrichaltheide ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4f0868730c19..a1c2c8d09e24 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -146,7 +146,7 @@ in stdenv.mkDerivation rec { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ "i686-linux" "x86_64-linux" ]; broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); }; |