about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoréclairevoyant <848000+eclairevoyant@users.noreply.github.com>2024-06-24 14:16:15 +0000
committerGitHub <noreply@github.com>2024-06-24 14:16:15 +0000
commit398222724ab1c7f62cc5dc6ee8cfd217be2bc2f5 (patch)
treecf2d51de7a4d6253ce389847430e2c81474ee72d /pkgs
parent3530b85902d489f24896163a0b2c4069d50b045c (diff)
parent27749da4f773605758eedd11c0bcb471fa601470 (diff)
Merge pull request #321653 from Frontear/update-quickemu
quickemu: 4.9.4 -> 4.9.4-unstable-2024-05-28
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/by-name/qu/quickemu/package.nix21
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix
index b650ef91f88ec..5349581aab119 100644
--- a/pkgs/by-name/qu/quickemu/package.nix
+++ b/pkgs/by-name/qu/quickemu/package.nix
@@ -56,13 +56,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickemu";
-  version = "4.9.4";
+  version = "4.9.4-unstable-2024-05-28";
 
   src = fetchFromGitHub {
     owner = "quickemu-project";
     repo = "quickemu";
-    rev = finalAttrs.version;
-    hash = "sha256-fjbXgze6klvbRgkJtPIUh9kEkP/As7dAj+cazpzelBY=";
+    rev = "d78255b097b599e8ab3713cb61c4085cc45f5a95"; # TODO: return to version on next release
+    hash = "sha256-fF306CdGqKM+779OLm0NNyqPBtm7TuU7UN/NanT12y8=";
   };
 
   postPatch = ''
@@ -74,16 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
       quickemu
   '';
 
-  patches = [
-    # reduces windows vm ram requirements to 4G, to match microsoft recommendations
-    # TODO: remove on next release
-    (fetchpatch2 {
-      name = "decrease-windows-ram-requirements.patch";
-      url = "https://github.com/quickemu-project/quickemu/commit/f51697593a4650c5486661292e2febe1d16f8c71.patch";
-      hash = "sha256-J5hIvQGtkufOcjk2FZN65iox/W2zkLlg+Veg9TF11Fs=";
-    })
-  ];
-
   nativeBuildInputs = [
     makeWrapper
     installShellFiles
@@ -106,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = testers.testVersion { package = quickemu; };
+  passthru.tests = testers.testVersion {
+    version = "4.9.5"; # required for passing tests, TODO: remove when release bump
+    package = quickemu;
+  };
 
   meta = {
     description = "Quickly create and run optimised Windows, macOS and Linux virtual machines";