Merge pull request #121 from codgician/qemu-update-script

Bump to nixos-25.05

Author: JulienMalka

flake.lock

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs-stable.url = "nixpkgs/nixos-24.11";
+    nixpkgs-stable.url = "nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     utils.url = "github:numtide/flake-utils";
     flake-compat.url = "github:edolstra/flake-compat";

flake.nix

@@ -61,7 +61,7 @@ let
     linstor-client = callPackage ./linstor-client { };
     linstor-proxmox = callPackage ./linstor-proxmox { };
     linstor-server = pkgs-unstable.callPackage ./linstor-server {
-      protobuf = pkgs-unstable.protobuf_23;
+      protobuf = pkgs-unstable.protobuf_24;
       jre = pkgs.jdk11_headless;
     };
     nixmoxer = callPackage ./nixmoxer { };

pkgs/default.nix

@@ -1,10 +1,10 @@
 {
   lib,
-  python3,
+  python310,
   fetchFromGitHub,
 }:
 
-python3.pkgs.buildPythonPackage rec {
+python310.pkgs.buildPythonPackage rec {
   pname = "linstor-api-py";
   version = "1.23.0";
   pyproject = true;
@@ -18,9 +18,9 @@ python3.pkgs.buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    python3.pkgs.setuptools
-    python3.pkgs.wheel
-    python3.pkgs.distutils
+    python310.pkgs.setuptools
+    python310.pkgs.wheel
+    python310.pkgs.distutils
   ];
 
   pythonImportsCheck = [ "linstor" ];

pkgs/linstor-api-py/default.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  python3,
+  python310,
   fetchFromGitHub,
   linstor-api-py,
   nix-update-script,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python310.pkgs.buildPythonApplication rec {
   pname = "linstor-client";
   version = "1.23.0";
   pyproject = true;
@@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [
-    python3.pkgs.setuptools
-    python3.pkgs.wheel
+    python310.pkgs.setuptools
+    python310.pkgs.wheel
   ];
 
   propagatedBuildInputs = [ linstor-api-py ];

pkgs/linstor-client/default.nix

@@ -34,7 +34,7 @@ let
       owner = "LINBIT";
       repo = "linstor-server";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-hKXFZgN2Z3v1MNAtI9Dm4ixumGvn7lv6SJcponxC+no=";
+      hash = "sha256-+rtvc6FrBQ9YjLiuJpVy/xzSpXp9AgIRNScRd4BPmYw=";
       fetchSubmodules = true;
       leaveDotGit = true;
     };

pkgs/linstor-server/default.nix

@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchgit {
     url = "git://git.proxmox.com/git/${pname}.git";
     rev = "c3cbcae289d04b4454a70fc59dc58a19d5edb681";
-    hash = "sha256-hO7b2WsTNU1WITNhdek5GppM7hiH1F6ijTfiqF3RBQY=";
+    hash = "sha256-rbKKcPwswZoIAFGdW9SxG2goHC4U8TG0pYQl1M6jku0=";
     fetchSubmodules = true;
     leaveDotGit = true;
   };

pkgs/proxmox-backup-qemu/default.nix

@@ -16,7 +16,7 @@
   usbutils,
   mimebase32,
   mimebase64,
-  substituteAll,
+  replaceVars,
 }:
 
 let
@@ -82,15 +82,13 @@ perl538.pkgs.toPerlModule (
     sourceRoot = "${src.name}/src";
 
     patches = [
-      (substituteAll {
-        src = ./0001-ss_fix_path.patch;
+      (replaceVars ./0001-ss_fix_path.patch {
         sspath = "${iproute2}/bin/";
       })
 
       ./0002-mknod-mknodat.patch
 
-      (substituteAll {
-        src = ./0003-pci-id-path.patch;
+      (replaceVars ./0003-pci-id-path.patch {
         pciutils = "${pciutils}";
       })
     ];

pkgs/pve-common/default.nix

@@ -27,12 +27,12 @@ in
 perl538.pkgs.toPerlModule (
   stdenv.mkDerivation rec {
     pname = "pve-http-server";
-    version = "5.1.2";
+    version = "5.2.2";
 
     src = fetchgit {
       url = "git://git.proxmox.com/git/${pname}.git";
-      rev = "2ef480f66473fd090e9a2cb02773461349e54502";
-      hash = "sha256-MsBGven0SCUMU0rcm2nFFCz2G5uSjcAlaLjZdIhS4aU=";
+      rev = "444a9e19f616b49b02238c76d3e5530a9fa27383";
+      hash = "sha256-RxUNSva6yyrNbPZFA4q7ndse6HZnLy8eDZ6//skxfJg=";
     };
 
     sourceRoot = "${src.name}/src";

pkgs/pve-http-server/default.nix

@@ -53,29 +53,28 @@ in
 perl538.pkgs.toPerlModule (
   stdenv.mkDerivation rec {
     pname = "pve-qemu-server";
-    version = "8.2.1";
+    version = "8.3.8";
 
     src = fetchgit {
       url = "git://git.proxmox.com/git/qemu-server.git";
-      rev = "54aa98cea5071b5cd325cfaeb21b7aaa4af9bb4d";
-      hash = "sha256-KjMkOTYrrXBB2HP9bXVJjDlBi86REe3lc8nEnUjZdls=";
+      rev = "78a0c43e7c6b844d1c4f7ce037ce32c9ed6857cd";
+      hash = "sha256-YktRlURya0pPg5mu+LVlJcBDhDW5Kd7tduZv0hgGyJo=";
     };
 
     postPatch = ''
       sed -i {qmeventd/,}Makefile \
         -e "/GITVERSION/d" \
         -e "/default.mk/d" \
         -e "/pve-doc-generator/d" \
-        -e "/install -m 0644 -D qm.bash-completion/,+4d" \
+        -e "/install -m 0644 -D qm.bash-completion/,+3d" \
         -e "/install -m 0644 qm.1/,+4d" \
         -e "s/qmeventd docs/qmeventd/" \
         -e "/qmeventd.8/d" \
-        -e "/SERVICEDIR/d" \
         -e "/modules-load.conf/d" \
         -e "s,usr/,,g"
 
       # Fix QEMU version check
-      sed -i PVE/QemuServer.pm -e "s/\[,\\\s\]//"
+      sed -i PVE/QemuServer/Helpers.pm -e "s/\[,\\\s\]//"
 
       # Fix libGL and libEGL detection
       sed -i PVE/QemuServer.pm -e "s|/usr/lib/x86_64-linux-gnu/lib|${libglvnd}/lib/lib|"
@@ -100,6 +99,11 @@ perl538.pkgs.toPerlModule (
       "PERLDIR=/${perl538.libPrefix}/${perl538.version}"
     ];
 
+    # Create missing SERVICEDIR
+    preInstall = ''
+      mkdir -p $out/lib/systemd/system
+    '';
+
     postFixup = ''
       find $out/lib -type f | xargs sed -i \
         -e "/ENV{'PATH'}/d" \