libguestfs: 1.54.0 -> 1.54.1 (#385519)

NixOS · Feb 27, 2025 · 0c1b58d · 0c1b58d
2 parents fd256f2 + cc608b0
commit 0c1b58d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/pkgs/by-name/li/libguestfs-with-appliance/package.nix b/pkgs/by-name/li/libguestfs-with-appliance/package.nix
@@ -4,9 +4,25 @@
   libguestfs-appliance,
 }:
 
+let
+  appliance = libguestfs-appliance;
+  # check explicit forward compatibility declaration:
+  # then do not warn if older appliance if known to work fine with newer libguestfs
+  libguestfsCompatible =
+    if lib.hasAttr "libguestfsCompatible" appliance then
+      appliance.libguestfsCompatible libguestfs
+    else
+      false;
+in
 # https://github.com/NixOS/nixpkgs/issues/280881
-lib.warnIf (builtins.compareVersions libguestfs.version libguestfs-appliance.version > 0)
-  "libguestfs has a higher version than libguestfs-appliance (${libguestfs.version} > ${libguestfs-appliance.version}), runtime errors may occur!"
+lib.warnIf
+  (
+    builtins.compareVersions (lib.versions.majorMinor libguestfs.version) (
+      lib.versions.majorMinor appliance.version
+    ) > 0
+    && !libguestfsCompatible
+  )
+  "libguestfs has a different version than ${appliance.pname} (${libguestfs.version} > ${appliance.version}), runtime errors may occur!"
 
   libguestfs.override
-  { appliance = libguestfs-appliance; }
+  { inherit appliance; }
diff --git a/pkgs/by-name/li/libguestfs/package.nix b/pkgs/by-name/li/libguestfs/package.nix
@@ -47,12 +47,11 @@ assert appliance == null || lib.isDerivation appliance;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libguestfs";
-
-  version = "1.54.0";
+  version = "1.54.1";
 
   src = fetchurl {
-    url = "https://libguestfs.org/download/${lib.versions.majorMinor finalAttrs.version}-stable/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-tK+g+P1YAgXqVUjUaLxuQ8O+y5leL2DmMmVSemMFQkY=";
+    url = "https://libguestfs.org/download/${lib.versions.majorMinor finalAttrs.version}-stable/libguestfs-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-bj/GrBkmdfe8KEClYbs2o209Wo36f4jqL1P4z2AqF34=";
   };
 
   strictDeps = true;