diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization')
20 files changed, 52 insertions, 101 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix index ca2c0f890d9a..63c137c220c2 100644 --- a/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix @@ -1,5 +1,5 @@ { stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages -, csmSupport ? false, seabios ? null +, csmSupport ? false, seabios , fdSize2MB ? csmSupport , fdSize4MB ? false , secureBoot ? false @@ -12,8 +12,6 @@ , sourceDebug ? false }: -assert csmSupport -> seabios != null; - let projectDscPath = if stdenv.isi686 then @@ -33,6 +31,7 @@ let i686 = "FV/OVMF"; x86_64 = "FV/OVMF"; aarch64 = "FV/AAVMF"; + riscv64 = "FV/RISCV_VIRT"; }; in @@ -68,7 +67,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { env.PYTHON_COMMAND = "python3"; postPatch = lib.optionalString csmSupport '' - cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin + cp ${seabios}/share/seabios/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''; postFixup = ( diff --git a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix index 3cfd905bc560..01b9960a5e88 100644 --- a/nixpkgs/pkgs/applications/virtualization/cntr/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA="; + sha256 = "sha256-spa4qPEhpNSZIk16jeH9YEr4g9JcVmpetHz72A/ZAPY="; }; - cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280="; + cargoHash = "sha256-YN8EtUXKtT8Xc0RnW7QqL+awyWy5xFKWhYMxgYG28I4="; passthru.tests = nixosTests.cntr; diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index c0d8bf884a20..124647e6ab7b 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , pkg-config , glib , glibc @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-GDbCjR3UWDo/AEKO3TZq29fxO9EUfymxWtvLBikJJ04="; + hash = "sha256-WUXyx5OWIJDamzHUahN+0/rcn2pxQgCgYAE/d0mxk2A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 82e814610dce..47381e4d1a1b 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.9"; + version = "1.7.11"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps="; + hash = "sha256-kvBD9Qh10kRowr32zDzjpHYh2IZC6+w+nOO4joShgEE="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 05de3c1626df..1cd8b02bacf7 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.28.2"; + version = "1.29.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-g9J66CZOAoco7UmK+xPEE6T5Aes3LWEG3J40LuDcvYo="; + sha256 = "sha256-Vy/sW8Y9SFSBaoectehF7ROxuypD7k7tAkcfrEK+pmI="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 62e424422fb0..226e29ebd3ff 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.6"; + version = "1.40.7"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-0rn+tqdPVjkIPxOwL9rDnolrpcsDOwOah0Y7924mjD4="; + hash = "sha256-X+7FMdIotnafUEKQUrvxYgN4qGqbtVJaZD+V4/whylM="; }; vendorHash = null; @@ -18,14 +18,14 @@ buildGoModule rec { nativeBuildInputs = [ makeBinaryWrapper ]; preBuild = '' - go generate github.com/docker-slim/docker-slim/pkg/appbom + go generate ./... ''; ldflags = [ "-s" "-w" - "-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}" - "-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}" + "-X github.com/slimtoolkit/slim/pkg/version.appVersionTag=${version}" + "-X github.com/slimtoolkit/slim/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index 8a0161476863..7659da2815e6 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.78.1"; + version = "1.79.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-8/hHv5veTQXNg8c5oew+5FWLAQkytTD2+Gdb30sY9lo="; + hash = "sha256-nq9voqmPvNemtUl3rcTSUjzrrk3DbcmZVzVYOdHkU2o="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/kraft/default.nix b/nixpkgs/pkgs/applications/virtualization/kraft/default.nix index e0d7a5a0dd18..f6e2ca39f7c7 100644 --- a/nixpkgs/pkgs/applications/virtualization/kraft/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-4T108ZMM10evGricLj8S+XYw3NXfUI68KlcraWA+nd0="; + hash = "sha256-PfZBuTeibXhKH/upLiCw2jrS2YWTXjj6BABhyUCGMlM="; }; - vendorHash = "sha256-qu0GQdjaYXj932KKBphP4CQWsAOssI4+42tPAD3iqik="; + vendorHash = "sha256-3zmtqxgCC9HqUoyMR8xse+U8U/71HYHCHBWzthZiEmw="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix b/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix index 6cbed6f41f60..622ba090e0ee 100644 --- a/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -3,7 +3,7 @@ , addOpenGLRunpath , fetchFromGitHub , pkg-config -, libelf +, elfutils , libcap , libseccomp , rpcsvc-proto @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ]; - buildInputs = [ libelf libcap libseccomp libtirpc ]; + buildInputs = [ elfutils libcap libseccomp libtirpc ]; makeFlags = [ "WITH_LIBELF=yes" diff --git a/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/nixpkgs/pkgs/applications/virtualization/lima/default.nix index b20bf2497fa5..53c6eb55d564 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.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sOOpqgEvDBVvD/o1wFL3ebqWw0XpSdEqY8cZmtdXyxE="; + sha256 = "sha256-0EKVWXNxOnz7j+f1ExkwQW69khhazj2Uz7RBAvwSjmQ="; }; - vendorHash = "sha256-vJlnptEja3nBfj/c1hSZjY9DZPQ970ZIMnHBPndd2vQ="; + vendorHash = "sha256-SfN4gj5nC9TEVD7aogsUv1um5w5Hvdy1eOSSNjGmnEw="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index a896829356b1..c8ca4b8d20ee 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.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yeZGhE+ImWXW3HPpAo+E1GOSEwPr7yK78XVmCocGqH4="; + sha256 = "sha256-EaJYuapTWzVD80UyhzjP1q1SCCNmUozf+hUl4wBgC14="; }; - cargoHash = "sha256-xqKYd80PCM7Rnj+9dV2XjigE4sweOnL4HfOQiOYzCEQ="; + cargoHash = "sha256-Vh5mdxxROVthDUzK+PRhl9AY5jcmvhEXP5UqOeqOm6o="; # skip test due FHS dependency doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix b/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix index 1c2422b25297..cc91256e4371 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-RSQcpodippp4B4FM0yr+YFseoofas1M6xBqqtFD1BB0="; + hash = "sha256-DXodgpa/oWDBlJYTXcJb8cBkG1DCjFv8vKEzLhu0pN4="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 8841abcd3671..93ef717d5297 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -62,13 +62,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.7.2"; + version = "4.8.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-o5FTCuFUbTlENqvh+u6fPEfD816tKWPxHu2yhBi/Mf0="; + hash = "sha256-pRmSaquovfMG3+Aa13W+AW2s7MjK2V/mSje4CQZyURs="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 5663f5e8a018..179ce41f02b2 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/nixpkgs/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,5 +1,5 @@ diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go -index 649748947..a981d93bf 100644 +index 4e43dd54c..a981d93bf 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go @@ -127,14 +127,6 @@ address can't be used by podman. ` @@ -7,10 +7,10 @@ index 649748947..a981d93bf 100644 if len(helper) < 1 { fmt.Print(fmtString) - } else { -- fmtString += `If you would like to install it run the\nfollowing commands: +- fmtString += `If you would like to install it, run the following commands: - - sudo %s install -- podman machine stop%[1]s; podman machine start%[1]s +- podman machine stop%[2]s; podman machine start%[2]s - - ` - fmt.Printf(fmtString, helper, suffix) diff --git a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 1dc000c3f41e..1cdd9f07337a 100644 --- a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , pixman, vde2, alsa-lib, texinfo, flex -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool +, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson +, sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet @@ -53,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; + hash = "sha256-vwDS+hIBDfiwrekzcd71jmMssypr/cX1oP+Oah+xvzI="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison meson ninja + pkg-config flex bison dtc meson ninja # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme diff --git a/nixpkgs/pkgs/applications/virtualization/seabios/default.nix b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix deleted file mode 100644 index 6256660161c1..000000000000 --- a/nixpkgs/pkgs/applications/virtualization/seabios/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchgit, acpica-tools, python3 }: - -stdenv.mkDerivation rec { - - pname = "seabios"; - version = "1.16.2"; - - src = fetchgit { - url = "https://git.seabios.org/seabios.git"; - rev = "rel-${version}"; - sha256 = "sha256-J2FuT+FXn9YoFLSfxDOxyKZvKrys59a6bP1eYvEXVNU="; - }; - - nativeBuildInputs = [ python3 ]; - - buildInputs = [ acpica-tools ]; - - strictDeps = true; - - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; - - configurePhase = '' - # build SeaBIOS for CSM - cat > .config << EOF - CONFIG_CSM=y - CONFIG_QEMU_HARDWARE=y - CONFIG_PERMIT_UNALIGNED_PCIROM=y - EOF - - make olddefconfig - ''; - - installPhase = '' - mkdir $out - cp out/Csm16.bin $out/Csm16.bin - ''; - - meta = with lib; { - description = "Open source implementation of a 16bit X86 BIOS"; - longDescription = '' - SeaBIOS is an open source implementation of a 16bit X86 BIOS. - It can run in an emulator or it can run natively on X86 hardware with the use of coreboot. - SeaBIOS is the default BIOS for QEMU and KVM. - ''; - homepage = "http://www.seabios.org"; - license = licenses.lgpl3; - maintainers = with maintainers; [ ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/virtualization/tart/default.nix b/nixpkgs/pkgs/applications/virtualization/tart/default.nix index a72d7599e203..29f84ba691d7 100644 --- a/nixpkgs/pkgs/applications/virtualization/tart/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - sha256 = "sha256-4G6HAfCx7PzFGN0hc8g5z545ierogNyGwex7/+lDFSQ="; + sha256 = "sha256-cXisvF+W/Uxe3Q0ZRhkvF13UWXxbsIQSzG172lzwruo="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/applications/virtualization/virter/default.nix b/nixpkgs/pkgs/applications/virtualization/virter/default.nix index 01cfe07da8ab..6d403feffa29 100644 --- a/nixpkgs/pkgs/applications/virtualization/virter/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "virter"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "LINBIT"; repo = "virter"; rev = "v${version}"; - hash = "sha256-NIZBaPYFFH3MG2M7rF39TW8sLVR44SA37ZU3gOPwAFU="; + hash = "sha256-Ae7lQveslZ4XqMmnC5mkZOk/8WSLXpmeRjkYUkIaasg="; }; - vendorHash = "sha256-cVOxRrsDdtlDSJ3WRDNk8nqt7ztz4GSRIf6FDDBxvPc="; + vendorHash = "sha256-7aWrY9EMTaJrNd0MTFIMfyUJ67I0LtndqNH0INo/OfA="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix b/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix index 11f5900ee84c..5cc81fc0ab85 100644 --- a/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix +++ b/nixpkgs/pkgs/applications/virtualization/xen/4.15.nix @@ -122,7 +122,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - ++ optional (withSeabios) "--with-system-seabios=${seabios}" + ++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios" ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" diff --git a/nixpkgs/pkgs/applications/virtualization/youki/default.nix b/nixpkgs/pkgs/applications/virtualization/youki/default.nix index 93355b74b472..70e481c9ab51 100644 --- a/nixpkgs/pkgs/applications/virtualization/youki/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/youki/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XoHGRCGLEG/a6gb+3ejYoeOuIml64U/p6CcxsFLoTWY="; + sha256 = "sha256-BZhg4VhJbAo6XO4w01zguodyr3KEbav+PON0aOmi2bI="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "youki" ]; cargoTestFlags = [ "-p" "youki" ]; - cargoHash = "sha256-L5IhOPo8BDQAvaSs3IJzJHN0TbgmUcEyv60IDLN4kn0="; + cargoHash = "sha256-IkL0gS3hht1XBnOy0YHO02vfw4sljtwfNImfojiLIE4="; meta = with lib; { description = "A container runtime written in Rust"; |