lib3mf: 2.3.2 -> 2.4.1, fix build, add updateScript (#424347)

authored by K900 and committed by GitHub 10b60fa6 21e18ff9

+25 -5
+25 -5
pkgs/by-name/li/lib3mf/package.nix
··· 2 lib, 3 stdenv, 4 fetchFromGitHub, 5 cmake, 6 ninja, 7 automaticcomponenttoolkit, ··· 12 openssl, 13 libuuid, 14 zlib, 15 }: 16 17 - stdenv.mkDerivation rec { 18 pname = "lib3mf"; 19 - version = "2.3.2"; 20 21 src = fetchFromGitHub { 22 owner = "3MFConsortium"; 23 repo = "lib3mf"; 24 - tag = "v${version}"; 25 - hash = "sha256-XEwrJINiNpI2+1wXxczirci8VJsUVs5iDUAMS6jWuNk="; 26 }; 27 28 nativeBuildInputs = [ 29 cmake ··· 79 80 doCheck = true; 81 82 meta = with lib; { 83 description = "Reference implementation of the 3D Manufacturing Format file standard"; 84 homepage = "https://3mf.io/"; 85 license = licenses.bsd2; 86 maintainers = with maintainers; [ ]; 87 platforms = platforms.all; 88 }; 89 - }
··· 2 lib, 3 stdenv, 4 fetchFromGitHub, 5 + fetchpatch, 6 cmake, 7 ninja, 8 automaticcomponenttoolkit, ··· 13 openssl, 14 libuuid, 15 zlib, 16 + nix-update-script, 17 }: 18 19 + stdenv.mkDerivation (finalAttrs: { 20 pname = "lib3mf"; 21 + version = "2.4.1"; 22 23 src = fetchFromGitHub { 24 owner = "3MFConsortium"; 25 repo = "lib3mf"; 26 + tag = "v${finalAttrs.version}"; 27 + hash = "sha256-wq/dT/8m+em/qFoNNj6s5lyx/MgNeEBGSMBpuJiORqA="; 28 }; 29 + 30 + patches = [ 31 + # some patches are required for the gcc 14 source build 32 + # remove next release 33 + # https://github.com/3MFConsortium/lib3mf/pull/413 34 + (fetchpatch { 35 + url = "https://github.com/3MFConsortium/lib3mf/pull/413/commits/96b2f5ec9714088907fe8a6f05633e2bbd82053f.patch?full_index=1"; 36 + hash = "sha256-cJRc+SW1/6Ypf2r34yroVTxu4NMJWuoSmzsmoXogrUk="; 37 + }) 38 + # https://github.com/3MFConsortium/lib3mf/pull/421 39 + (fetchpatch { 40 + url = "https://github.com/3MFConsortium/lib3mf/pull/421/commits/6d7b5709a4a1cf9bd55ae8b4ae999c9ca014f62c.patch?full_index=1"; 41 + hash = "sha256-rGOyXZUZglRNMu1/oVhgSpRdi0pUa/wn5SFHCS9jVOY="; 42 + }) 43 + ]; 44 45 nativeBuildInputs = [ 46 cmake ··· 96 97 doCheck = true; 98 99 + passthru.updateScript = nix-update-script { }; 100 + 101 meta = with lib; { 102 + changelog = "https://github.com/3MFConsortium/lib3mf/releases/tag/${finalAttrs.src.tag}"; 103 description = "Reference implementation of the 3D Manufacturing Format file standard"; 104 homepage = "https://3mf.io/"; 105 license = licenses.bsd2; 106 maintainers = with maintainers; [ ]; 107 platforms = platforms.all; 108 }; 109 + })