diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization')
12 files changed, 70 insertions, 47 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix b/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix index 2d5e61a30d41..3e7027f9dfd9 100644 --- a/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/buildkit-nix/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkit-nix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gKTCBz7om1M7UBzyMJDetNGcKLkQKMyuzwrHBbuuifM="; + sha256 = "sha256-i8KQLLL36iP26jIj10fZLtYpS57Xni4eIQEJG4ixWy8="; }; - vendorHash = "sha256-1H5oWgcaamf+hocABWWnzJUjWiqwk1ZZtbBjF6EKzzU="; + vendorHash = "sha256-SFsf2QOIuUQY5Zzshb2190pQtOBGEsELBRihOvHYVGA="; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 7e3c6d645468..7a0dc67dba28 100644 --- a/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--workspace" "--bins" "--lib" # Integration tests require root. - "--exclude" "net_util" # Tries to access /dev/net/tun + "--exclude" "net_util" # /dev/net/tun + "--exclude" "vmm" # /dev/kvm ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/nixpkgs/pkgs/applications/virtualization/ddev/default.nix index aaaca9a47b95..dab4033486eb 100644 --- a/nixpkgs/pkgs/applications/virtualization/ddev/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-3uDdp827noiY6P7VSBXM34MTe9+MCEkNtuRQ3eFoBnk="; + hash = "sha256-S3NesYJH66vqMSDSd2UKWyjOjrZYasY0sWqYMiQC7i0="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix b/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix index a26fb0ecf531..163910237a37 100644 --- a/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix @@ -1,14 +1,14 @@ { stdenvNoCC, lib, fetchFromGitHub, makeWrapper, wget }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; version = "1.5.0.2"; src = fetchFromGitHub { owner = "89luca89"; - repo = pname; - rev = version; - sha256 = "sha256-ss8049D6n1V/gDzEMjywDnoke5s2we9j3mO8yta72UA="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-ss8049D6n1V/gDzEMjywDnoke5s2we9j3mO8yta72UA="; }; dontConfigure = true; @@ -44,4 +44,4 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ atila ]; }; -} +}) diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index 284c03970761..218c50fb1ee5 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.75.0"; + version = "1.75.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-pjBAu7QyDZdZbGK2pmvF75C6M3liS0KixupUx+iCEjA="; + hash = "sha256-30KDmbT46K5/jE2aSFkX2TZZvWDtzudazTyqFiyLTds="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/applications/virtualization/ignite/default.nix b/nixpkgs/pkgs/applications/virtualization/ignite/default.nix index 9ab1d36fef52..89387e822d86 100644 --- a/nixpkgs/pkgs/applications/virtualization/ignite/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/ignite/default.nix @@ -21,7 +21,7 @@ buildGoModule rec{ leaveDotGit = true; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix b/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix index e3b52c411d6b..e7429f3312da 100644 --- a/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/kvmtool/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "kvmtool"; - version = "unstable-2023-04-06"; + version = "unstable-2023-07-12"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; - rev = "77b108c6a6f1c66fb7f60a80d17596bb80bda8ad"; - sha256 = "sha256-wPhqjVpc6I9UOdb6lmzGh797sdvJ5q4dap2ssg8OY5E="; + rev = "106e2ea7756d980454d68631b87d5e25ba4e4881"; + sha256 = "sha256-wpc5DfHnui0lBVH4uOq6a7pXVUZStjNLRvauu6QpRvE="; }; buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation { description = "A lightweight tool for hosting KVM guests"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; license = licenses.gpl2Only; - maintainers = with maintainers; [ astro ]; + maintainers = with maintainers; [ astro mfrw ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "nvramtool"; + mainProgram = "lkvm"; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index ca097adac773..68e37fdbd7f8 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.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rt65BXrDFne7bT26yQLVMNwwgN8JAmXLrGx/BLlInkI="; + sha256 = "sha256-iZOcpVvhHbf8u2NrnwAIg7jlTN/afeBi2+jbsNYKlz4="; }; - cargoHash = "sha256-dZbLLxvkJzApl9+MwbZRJQXFzMHOfbikwEZs9wFKZHQ="; + cargoHash = "sha256-cysxQ4qc70zpEOpL5bccMHdEDGbdjzbGftTMb58RrYc="; # skip test due FHS dependency doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 286a6f74c975..078c786ae23e 100644 --- a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -39,18 +39,18 @@ , withX ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.2.5"; + version = "12.3.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; - rev = "stable-${version}"; - hash = "sha256-Aa2OzY3x8yRn/uFaCbbKihpsPueup7doPp5i8I04iaQ="; + rev = "stable-${finalAttrs.version}"; + hash = "sha256-YVpWomLED5sBKXKdJtuDjb7/aKB2flVIm2ED3xSsccE="; }; - sourceRoot = "${src.name}/open-vm-tools"; + sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; outputs = [ "out" "dev" ]; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vmware/open-vm-tools"; - changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${version}"; + changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${finalAttrs.version}"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for @@ -147,4 +147,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = with maintainers; [ joamaki kjeremy ]; }; -} +}) diff --git a/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix index 1c5a20d8b852..b1b03d09680f 100644 --- a/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "The RISC-V Virtual Machine"; license = with licenses; [ gpl3 /* or */ mpl20 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nebulka ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/umoci/default.nix b/nixpkgs/pkgs/applications/virtualization/umoci/default.nix index 6af9382d2b7d..627817139c8c 100644 --- a/nixpkgs/pkgs/applications/virtualization/umoci/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/umoci/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "0in8kyi4jprvbm3zsl3risbjj8b0ma62yl3rq8rcvcgypx0mn7d4"; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix index 7c2424ef0f44..c1bce1f9bc7f 100644 --- a/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix @@ -1,28 +1,49 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, testers +, vpcs +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vpcs"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "GNS3"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-joEXRMtNZMQumkYDX1gdpGAV+XdNKiAMj3dh1GZxeqc="; + repo = "vpcs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY="; }; - buildPhase = ''( - cd src - ./mk.sh ${stdenv.buildPlatform.linuxArch} - )''; + sourceRoot = "${finalAttrs.src.name}/src"; + + buildPhase = '' + runHook preBuild + + MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch} + + runHook postBuild + ''; installPhase = '' - install -D -m555 src/vpcs $out/bin/vpcs; - install -D -m444 man/vpcs.1 $out/share/man/man1/vpcs.1; + runHook preInstall + + install -D -m555 vpcs $out/bin/vpcs + install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 + + runHook postInstall ''; enableParallelBuilding = true; + passthru = { + tests.version = testers.testVersion { + package = vpcs; + command = "vpcs -v"; + }; + }; + meta = with lib; { description = "A simple virtual PC simulator"; longDescription = '' @@ -30,9 +51,10 @@ stdenv.mkDerivation rec { ping/traceroute them, or ping/traceroute the other hosts/routers from the VPCS when you study the Cisco routers in the dynamips. ''; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = platforms.linux ++ platforms.darwin; + mainProgram = "vpcs"; + maintainers = with maintainers; [ anthonyroussel ]; }; -} +}) |