From 49b9448e9cb75da4260d5837dafb4cd9a861e816 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 11 Jul 2025 17:29:53 +0200
Subject: [PATCH 1/2] lib3mf: 2.3.2 -> 2.4.1, fix build, add updateScript

Hydra failure: https://hydra.nixos.org/build/301834239

release notes: https://github.com/3MFConsortium/lib3mf/releases/tag/v2.4.1
---
 pkgs/by-name/li/lib3mf/package.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 767dd6cfed66e..d52b9ce8ae2dc 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   ninja,
   automaticcomponenttoolkit,
@@ -12,19 +13,35 @@
   openssl,
   libuuid,
   zlib,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "lib3mf";
-  version = "2.3.2";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "3MFConsortium";
     repo = "lib3mf";
     tag = "v${version}";
-    hash = "sha256-XEwrJINiNpI2+1wXxczirci8VJsUVs5iDUAMS6jWuNk=";
+    hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA=";
   };
 
+  patches = [
+    # some patches are required for the gcc 14 source build
+    # remove next release
+    # https://github.com/3MFConsortium/lib3mf/pull/413
+    (fetchpatch {
+      url = "https://github.com/3MFConsortium/lib3mf/pull/413/commits/96b2f5ec9714088907fe8a6f05633e2bbd82053f.patch?full_index=1";
+      hash = "sha256-cJRc+SW1/6Ypf2r34yroVTxu4NMJWuoSmzsmoXogrUk=";
+    })
+    # https://github.com/3MFConsortium/lib3mf/pull/421
+    (fetchpatch {
+      url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1";
+      hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
@@ -79,6 +96,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";

From acf3715ac7e4ec045cfc6ce764261887a70fbb30 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 11 Jul 2025 17:35:42 +0200
Subject: [PATCH 2/2] lib3mf: modernize

---
 pkgs/by-name/li/lib3mf/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index d52b9ce8ae2dc..c7b987841844d 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -16,14 +16,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lib3mf";
   version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "3MFConsortium";
     repo = "lib3mf";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA=";
   };
 
@@ -99,10 +99,11 @@ stdenv.mkDerivation rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
+    changelog = "https://github.com/3MFConsortium/lib3mf/releases/tag/${finalAttrs.src.tag}";
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
     license = licenses.bsd2;
     maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
-}
+})