From 27810f1018550870092a55707bf4e31598cd4d85 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 3 Nov 2024 16:37:29 +0100 Subject: [PATCH 1/6] Revert "python3Packages.materialx: 1.38.10 -> 1.39.1" This reverts commit 993ec329851b363c24ceac95034c6bc7111acb0b. MaterialX has some upstream issues which haven't been quite worked out, yet[1]. It is therefore reasonable to wait with an update in nixpkgs. It also breaks downstream packages like python312Packages.openusd as well as blender[2] [1]: https://github.com/PixarAnimationStudios/OpenUSD/pull/3159 [2]: https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293033805 Signed-off-by: Florian Brandes --- pkgs/development/python-modules/materialx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 77f857572340..2e7af7b89b1f 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "materialx"; - version = "1.39.1"; + version = "1.38.10"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; - rev = "refs/tags/v${version}"; - hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s="; + rev = "v${version}"; + hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; }; format = "other"; From 3bea63b232b4715a1e9bc1077414fe46b76e3308 Mon Sep 17 00:00:00 2001 From: ShaddyDC Date: Mon, 28 Oct 2024 09:39:21 +0100 Subject: [PATCH 2/6] python312Packages.openusd: apply upstream patch to fix build Co-authored-by: ShadyDC Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index b9f88f3b5d51..9dd9e4531920 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -70,8 +70,9 @@ buildPythonPackage rec { patches = [ (fetchpatch { name = "port-to-embree-4.patch"; - url = "https://github.com/PixarAnimationStudios/OpenUSD/pull/2266/commits/4b6c23d459c602fdac5e0ebc9b7722cbd5475e86.patch"; - hash = "sha256-yjqdGAVqfEsOX1W/tG6c+GgQLYya5U9xgUe/sNIuDbw="; + # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266 + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1"; + hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI="; }) ]; From a886b69be8c321a8d98d1e966d2d9d836d109056 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 3 Nov 2024 20:20:21 +0100 Subject: [PATCH 3/6] python312Packages.openusd: conform to PEP 517 Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 9dd9e4531920..c8b7e41084ad 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -52,6 +52,7 @@ in buildPythonPackage rec { pname = "openusd"; version = "24.08"; + pyproject = false; src = fetchFromGitHub { owner = "PixarAnimationStudios"; @@ -65,8 +66,6 @@ buildPythonPackage rec { outputs = [ "out" ] ++ lib.optional withDocs "doc"; - format = "other"; - patches = [ (fetchpatch { name = "port-to-embree-4.patch"; From 8f55121f7f7921b2ea7f601fa425d6b8266c6bd7 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 3 Nov 2024 16:00:28 +0100 Subject: [PATCH 4/6] lib/licenses.nix: add tost this adds the license for OpenUSD which is explained here https://forum.aousd.org/t/upcoming-openusd-license-update/1561 Signed-off-by: Florian Brandes --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 291c66ea850e..9affe6a2d63c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1212,6 +1212,11 @@ lib.mapAttrs mkLicense ({ fullName = "TCL/TK License"; }; + tost = { + fullName = "Tomorrow Open Source Technology License 1.0"; + url = "https://github.com/PixarAnimationStudios/OpenUSD/blob/release/LICENSE.txt"; + }; + ucd = { fullName = "Unicode Character Database License"; url = "https://fedoraproject.org/wiki/Licensing:UCD"; From 692457183faf7d1ae8b61e9336ff2262564382a7 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 3 Nov 2024 16:40:34 +0100 Subject: [PATCH 5/6] python312Packages.openusd: apply upsteam's new license Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index c8b7e41084ad..4af208f98f5e 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -175,7 +175,7 @@ buildPythonPackage rec { for interchange between graphics applications. ''; homepage = "https://openusd.org/"; - license = lib.licenses.asl20; + license = lib.licenses.tost; maintainers = with lib.maintainers; [ shaddydc ]; }; } From e2a21bddefb8cbd10710d9dcd4a2293d01325e27 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 4 Nov 2024 11:57:50 +0100 Subject: [PATCH 6/6] python312Packages.openusd: add gador as co-maintainer Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 4af208f98f5e..f44a712aaf80 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -176,6 +176,9 @@ buildPythonPackage rec { ''; homepage = "https://openusd.org/"; license = lib.licenses.tost; - maintainers = with lib.maintainers; [ shaddydc ]; + maintainers = with lib.maintainers; [ + shaddydc + gador + ]; }; }