quickemu: 4.9.2 -> 4.9.4

This commit is contained in:
Martin Wimpress 2024-05-10 00:06:02 +01:00
parent cd850be6ad
commit 49d656d258
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
2 changed files with 28 additions and 25 deletions

View file

@ -2,21 +2,23 @@
, fetchFromGitHub , fetchFromGitHub
, stdenv , stdenv
, makeWrapper , makeWrapper
, qemu , cdrtools
, curl
, gawk
, gnugrep , gnugrep
, gnused , gnused
, lsb-release
, jq , jq
, ncurses
, pciutils
, procps , procps
, python3 , python3
, cdrtools , qemu
, usbutils
, util-linux
, socat , socat
, spice-gtk , spice-gtk
, swtpm , swtpm
, usbutils
, util-linux
, unzip , unzip
, wget
, xdg-user-dirs , xdg-user-dirs
, xrandr , xrandr
, zsync , zsync
@ -28,35 +30,37 @@
}: }:
let let
runtimePaths = [ runtimePaths = [
qemu cdrtools
curl
gawk
gnugrep gnugrep
gnused gnused
jq jq
lsb-release ncurses
pciutils
procps procps
python3 python3
cdrtools qemu
socat
swtpm
usbutils usbutils
util-linux util-linux
unzip unzip
socat
swtpm
wget
xdg-user-dirs xdg-user-dirs
xrandr xrandr
zsync zsync
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs : {
pname = "quickemu"; pname = "quickemu";
version = "4.9.2"; version = "4.9.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quickemu-project"; owner = "quickemu-project";
repo = "quickemu"; repo = "quickemu";
rev = version; rev = finalAttrs.version;
hash = "sha256-StYgnFBnEJUkJDyFluMm01xhgejXc99AEldGGxIvZU0="; hash = "sha256-fjbXgze6klvbRgkJtPIUh9kEkP/As7dAj+cazpzelBY=";
}; };
postPatch = '' postPatch = ''
@ -74,11 +78,11 @@ stdenv.mkDerivation rec {
runHook preInstall runHook preInstall
installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.1 installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.1
install -Dm755 -t "$out/bin" macrecovery quickemu quickget windowskey install -Dm755 -t "$out/bin" chunkcheck quickemu quickget quickreport windowskey
# spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection # spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection
# is enabled, the wrapped spice-client-glib-usb-acl-helper is used # is enabled, the wrapped spice-client-glib-usb-acl-helper is used
for f in macrecovery quickget quickemu windowskey; do for f in chunkcheck quickget quickemu quickreport windowskey; do
wrapProgram $out/bin/$f \ wrapProgram $out/bin/$f \
--prefix PATH : "${lib.makeBinPath runtimePaths}" \ --prefix PATH : "${lib.makeBinPath runtimePaths}" \
--suffix PATH : "${lib.makeBinPath [ spice-gtk ]}" --suffix PATH : "${lib.makeBinPath [ spice-gtk ]}"
@ -89,10 +93,11 @@ stdenv.mkDerivation rec {
passthru.tests = testers.testVersion { package = quickemu; }; passthru.tests = testers.testVersion { package = quickemu; };
meta = with lib; { meta = {
description = "Quickly create and run optimised Windows, macOS and Linux desktop virtual machines"; description = "Quickly create and run optimised Windows, macOS and Linux virtual machines";
homepage = "https://github.com/quickemu-project/quickemu"; homepage = "https://github.com/quickemu-project/quickemu";
license = licenses.mit; mainProgram = "quickemu";
maintainers = with maintainers; [ fedx-sudo ]; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fedx-sudo flexiondotorg ];
}; };
} })

View file

@ -231,8 +231,6 @@ with pkgs;
# Post 24.11 branch-off, this should throw an error in aliases.nix. # Post 24.11 branch-off, this should throw an error in aliases.nix.
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
quickemu = callPackage ../development/quickemu { };
quickgui = callPackage ../applications/virtualization/quickgui { }; quickgui = callPackage ../applications/virtualization/quickgui { };
adcli = callPackage ../os-specific/linux/adcli { }; adcli = callPackage ../os-specific/linux/adcli { };