Merge pull request #198 from SaumonNet/pve9

PVE 9.x update

Author: camillemndn

flake.lock

@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs-stable.url = "nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-libvncserver.url = "nixpkgs/e6f23dc08d3624daab7094b701aa3954923c6bbb";
     utils.url = "github:numtide/flake-utils";
     flake-compat.url = "github:edolstra/flake-compat";
   };
@@ -16,12 +17,10 @@
       self,
       nixpkgs-stable,
       nixpkgs-unstable,
+      nixpkgs-libvncserver,
       utils,
       ...
     }:
-    let
-      inherit (nixpkgs-stable) lib;
-    in
     {
       nixosModules = import ./modules;
     }
@@ -38,21 +37,15 @@
           let
             pkgs = import nixpkgs-stable {
               inherit system;
-              overlays = [ self.overlays.${system} ];
+              overlays = [
+                self.overlays.${system}
+                (_: _: { inherit (nixpkgs-libvncserver.legacyPackages.${system}) libvncserver; })
+              ];
             };
+
             pkgs-unstable = import nixpkgs-unstable {
               inherit system;
-              overlays = [
-                (_: prev: {
-                  pacemaker = prev.pacemaker.overrideAttrs (_: {
-                    env.NIX_CFLAGS_COMPILE = toString (
-                      [ "-Wno-error=deprecated-declarations" ]
-                      ++ lib.optionals prev.stdenv.cc.isGNU [ "-Wno-error=strict-prototypes" ]
-                    );
-                  });
-
-                })
-              ];
+              overlays = [ ];
             };
           in
           {

flake.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  pkgs-unstable,
   ...
 }:
 let
@@ -63,8 +62,7 @@ let
     linstor-api-py = callPackage ./linstor-api-py { };
     linstor-client = callPackage ./linstor-client { };
     linstor-proxmox = callPackage ./linstor-proxmox { };
-    linstor-server = pkgs-unstable.callPackage ./linstor-server {
-      protobuf = pkgs-unstable.protobuf_24;
+    linstor-server = callPackage ./linstor-server {
       jre = pkgs.jdk11_headless;
     };
 

pkgs/default.nix

@@ -2,21 +2,21 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  perl538,
+  perl540,
   nix-update-script,
 }:
 
 let
-  perlDeps = with perl538.pkgs; [
+  perlDeps = with perl540.pkgs; [
     JSONXS
     RESTClient
     TypesSerialiser
   ];
 
-  perlEnv = perl538.withPackages (_: perlDeps);
+  perlEnv = perl540.withPackages (_: perlDeps);
 in
 
-perl538.pkgs.toPerlModule (
+perl540.pkgs.toPerlModule (
   stdenv.mkDerivation rec {
     pname = "linstor-proxmox";
     version = "8.1.3";
@@ -30,7 +30,7 @@ perl538.pkgs.toPerlModule (
 
     makeFlags = [
       "DESTDIR=$(out)"
-      "PERLDIR=/${perl538.libPrefix}/${perl538.version}"
+      "PERLDIR=/${perl540.libPrefix}/${perl540.version}"
     ];
 
     buildInputs = [ perlEnv ];

pkgs/linstor-proxmox/default.nix

@@ -23,18 +23,19 @@
   thin-provisioning-tools,
   util-linux,
   zfs,
+  writeScript,
 }:
 
 let
   self = stdenv.mkDerivation (finalAttrs: {
     pname = "linstor-server";
-    version = "1.29.0";
+    version = "1.32.3";
 
     src = fetchFromGitHub {
       owner = "LINBIT";
       repo = "linstor-server";
       rev = "v${finalAttrs.version}";
-      hash = "sha256-+rtvc6FrBQ9YjLiuJpVy/xzSpXp9AgIRNScRd4BPmYw=";
+      hash = "sha256-khXu6DGOMh+0SYt8T43sLAQs4FFBXTCIUPORcqQHNEU=";
       fetchSubmodules = true;
       leaveDotGit = true;
     };
@@ -116,7 +117,14 @@ let
           ]
         }
     '';
-  });
 
+    passthru.updateScript = writeScript "update-linstor-server" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p nix-update
+
+      nix-update linstor-server --flake # update version and hash
+      bash $(nix build --no-link --print-out-paths .#packages.x86_64-linux.linstor-server.mitmCache.updateScript)
+    '';
+  });
 in
 self