From 916d18598dee8dea5db54597088d1d3df57fa027 Mon Sep 17 00:00:00 2001 From: ShaddyDC Date: Sat, 7 Mar 2026 16:37:59 +0100 Subject: [PATCH] =?UTF-8?q?python3Packages.openusd:=2025.05.01=20=E2=86=92?= =?UTF-8?q?=2026.03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove upstreamed embree patch - Remove removed distutils dependency --- pkgs/development/python-modules/openusd/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f38cc9c48a4f..303cdbb3f625 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -4,7 +4,6 @@ boost, buildPythonPackage, cmake, - distutils, doxygen, draco, embree, @@ -52,25 +51,19 @@ in buildPythonPackage rec { pname = "openusd"; - version = "25.05.01"; + version = "26.03"; pyproject = false; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenUSD"; tag = "v${version}"; - hash = "sha256-gxikEC4MqTkhgYaRsCVYtS/VmXClSaCMdzpQ0LmiR7Q="; + hash = "sha256-Ijh7x63TqEkittO+r//sIkBu7I52/6C7a2n9Nq6Kt7g="; }; outputs = [ "out" ] ++ lib.optional withDocs "doc"; patches = [ - (fetchpatch { - name = "port-to-embree-4.patch"; - # https://github.com/PixarAnimationStudios/OpenUSD/pull/2266 - url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/9ea3bc1ab550ec46c426dab04292d9667ccd2518.patch?full_index=1"; - hash = "sha256-QjA3kjUDsSleUr+S/bQLb+QK723SNFvnmRPT+ojjgq8="; - }) (fetchpatch { # https://github.com/PixarAnimationStudios/OpenUSD/pull/3648 name = "propagate-dependencies-opengl.patch"; @@ -141,7 +134,6 @@ buildPythonPackage rec { numpy opensubdiv pyopengl - distutils ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL