diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization')
13 files changed, 40 insertions, 42 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index a27930fcb4ac..d0eceae70525 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno="; + hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libseccomp systemd ] - ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 8b04cda31864..7d7a2730cd24 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.3"; + version = "1.7.5"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-BUbZe37rBZTr6nWb4lY2HHuwtq7toDUkGaJOiOoVkWI="; + hash = "sha256-g+1JfXO1k0ijPpVTo+WxmXro4p4MbRCIZdgtgy58M60="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index ad48ae1e0d8c..4cbc7b20d562 100644 --- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY="; + sha256 = "sha256-vVw3mVliu9JiCgTpwBfubaOkEkNJD4Tb1M7HARg5VjA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index f9c15b35e43b..6a3da1f03a66 100644 --- a/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -1,31 +1,21 @@ -{ lib, rustPlatform, fetchgit, fetchpatch -, pkg-config, protobuf, python3, wayland-scanner +{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "115.2"; + version = "116.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "d14053a211eb6753c53ced71fad2d3b402b997e6"; - sha256 = "8p6M9Q9E07zqtHYdIIi6io9LLatd+9fH4Inod2Xjy5M="; + rev = "97ac6ce38d8e5789c91fcc5bae6078d21a2afdb3"; + sha256 = "NssjHXorPGZBYqERPeLW3cqEzbXqyL9N4OnLLQMLALk="; fetchSubmodules = true; }; - patches = [ - # Backport option to not vendor virglrenderer. - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/dde9aa0e6d89a090f5d5f000822f7911eba98445%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-W/s1i2reBXsbr0AOEtL9go3TNNYMwDVEu6pz3Q9wBSU="; - }) - ]; - separateDebugInfo = true; - cargoSha256 = "ZXyMeu2forItGcsGrNBWhV1V9HzVQK6LM4TxBrxAZnU="; + cargoHash = "sha256-mlXAlq62nAW6ZVxRav+k/iU1YDecfPDTCPp7FdJBO54="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 1834d38d7fb1..72216d095488 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-slim"; - version = "1.40.3"; + version = "1.40.4"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-fXB2rMW73F12ZO1sqUIiaky6LDiMasg3QcIgeWwtkOs="; + hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 950c611ca2ce..db6d5a3dadb9 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.20.3"; + version = "2.21.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-dCcCtQTow8S0dyAD8UT6p64erSAl7oiZdbpYsO4/Z/s="; + hash = "sha256-JekWw5YI6O+CLXc7oNIxPJsRzYimGFDGL6ACyM4D04k="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-pNCAEuaF4FkSCmW1JcDMxOtVM6mL7dYLtVu4oUBqoS8="; + vendorHash = "sha256-vVnaZLvPbhJNFn/ACuYDbXCKPKNlYoGCm+liTlPMcjs="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index 78571451036d..284c03970761 100644 --- a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.73.1"; + version = "1.75.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-+IFlr1xLLnk0Ox3CcHUdEEiDqk5z0MegWu6h9RW7M8Q="; + hash = "sha256-pjBAu7QyDZdZbGK2pmvF75C6M3liS0KixupUx+iCEjA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix index fab9d6b68017..2400c19d40ea 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/bin.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.17.0"; + version = "0.17.2"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "c1b6cd12d13a67918be0f85c1036c2fbc894ef91707cbb9a8c346c0cb371a4e5"; + sha256 = "c7e328369e6842b15452b440daa5137e00da57ca7aa025b1cf7f80bd5c7843a9"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "cecefed3ae3aadc25b591973db51f89278589cb53605b17282b8afb7c38febab"; + sha256 = "5b8954b3040b82016701091bed4ac99c668ffb8d362dc7a0fdf5cb9a6ed9ebb1"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "b07fc3af272b7e86ea913a91722f46a8bc6361d74c2db9ca097c88852e444f1d"; + sha256 = "20df104067f255212cd6df82508961b20bf4c0a16a233a74d495a4b6ee3a62e8"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "1e455d4d1a213db2521aba3b1d282fcee70e5e42482f32177488539e8b35c103"; + sha256 = "a9af3aec848ed7bc490baff2f1d785334cbbc6cd94f981705cc0aeab833288b0"; }; }; in @@ -108,5 +108,6 @@ stdenvNoCC.mkDerivation { description = "Linux virtual machines (on macOS, in most cases)"; license = licenses.asl20; maintainers = with maintainers; [ tricktron ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/nixpkgs/pkgs/applications/virtualization/lima/default.nix index 3aed14d9ca95..9dc433c1716d 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EVPIb8+0pMDq7sRiG5ERHRW8Lq2NRdHiBj0zPouzwpc="; + sha256 = "sha256-0yWQhyDSDGZT6K/SeVntTdqnDzyGD244+r5kG1MFh1c="; }; - vendorHash = "sha256-BrfrCsVJ6ca16dyBHOUXFZHU8JZz2iUxcc2gGf3MF/U="; + vendorHash = "sha256-yA6qwnbRFR/V2Aaf53jLTejPKuNzbod2dVnLEQLoQkM="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index 60808705e8dd..67baa3ab91bd 100644 --- a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://looking-glass.io/"; license = licenses.gpl2Plus; + mainProgram = "looking-glass-client"; maintainers = with maintainers; [ alexbakker babbaj j-brn ]; platforms = [ "x86_64-linux" ]; }; diff --git a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index 6c9ea55a2949..513da2279614 100644 --- a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pm02VKqaxXVLKqChbp7MQIccwzukAG2h0QrEZftQoQo="; + sha256 = "sha256-xUQpo9KqKXKz1nT+eqmIX1domBHGsFO1DQoR/lDdncM="; }; - cargoHash = "sha256-elBLH2n+t+bixKePRmK1YiXsdDuerYzV+PbpjFEcA1g="; + cargoHash = "sha256-6OuDZzX7mCc8LiC808eu1fa1OspA5+Yk5h3VxusgFDU="; # skip test due FHS dependency doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix index 2e4d589d158e..3b110d9bc991 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix @@ -207,12 +207,16 @@ in substituteInPlace "$out/bin/run-singularity" \ --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" wrapProgram "$out/bin/${projectName}" \ - --prefix PATH : "''${defaultPathInputs// /\/bin:}" + --prefix PATH : "''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}" # Make changes in the config file ${lib.optionalString enableNvidiaContainerCli '' substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" ''} + ${lib.optionalString (enableNvidiaContainerCli && projectName == "singularity") '' + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ + --replace "# nvidia-container-cli path =" "nvidia-container-cli path = ${nvidia-docker}/bin/nvidia-container-cli" + ''} ${lib.optionalString (removeCompat && (projectName != "singularity")) '' unlink "$out/bin/singularity" for file in "$out"/share/man/man?/singularity*.gz; do diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 1a9fe490af85..163812bdccf0 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -2,6 +2,7 @@ , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch +, desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null }: @@ -20,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils - ]; + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ wrapGAppsHook @@ -91,6 +92,7 @@ python3.pkgs.buildPythonApplication rec { ''; license = licenses.gpl2; platforms = platforms.unix; + mainProgram = "virt-manager"; maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } |