From 8f72df78f3ad605c507196988f4773c192824907 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 28 Apr 2025 20:21:52 +0800
Subject: [PATCH 1/3] python3Packages.openusd: remove deprecated stub on darwin

---
 pkgs/development/python-modules/openusd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index da2f0e13effe..a96a3acb5528 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -4,7 +4,6 @@
   boost,
   buildPythonPackage,
   cmake,
-  darwin,
   distutils,
   doxygen,
   draco,
@@ -142,7 +141,6 @@ buildPythonPackage rec {
       libX11
       libXt
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ])
     ++ lib.optionals withOsl [ osl ]
     ++ lib.optionals withUsdView [ qt6.qtbase ]
     ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [

From ea126f64abf4be5e9c86f5139babdca595e8cf88 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 28 Apr 2025 20:29:19 +0800
Subject: [PATCH 2/3] python3Packages.openusd: add `meta.changelog`, remove
 duplicate inputs

---
 pkgs/development/python-modules/openusd/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index a96a3acb5528..e5c2d2064893 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -143,10 +143,7 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals withOsl [ osl ]
     ++ lib.optionals withUsdView [ qt6.qtbase ]
-    ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [
-      qt6.qtbase
-      qt6.qtwayland
-    ];
+    ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ];
 
   propagatedBuildInputs =
     [
@@ -186,6 +183,7 @@ buildPythonPackage rec {
       for interchange between graphics applications.
     '';
     homepage = "https://openusd.org/";
+    changelog = "https://github.com/PixarAnimationStudios/OpenUSD/${src.tag}/CHANGELOG.md";
     license = lib.licenses.tost;
     maintainers = with lib.maintainers; [
       shaddydc

From 3b1ce66257345adb324d5b24d225e73520157fb8 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Tue, 29 Apr 2025 09:19:29 +0800
Subject: [PATCH 3/3] python3Packages.openusd: 24.11 -> 25.02a

---
 .../python-modules/openusd/default.nix          | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index e5c2d2064893..f359e88ad818 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -51,14 +51,14 @@ in
 
 buildPythonPackage rec {
   pname = "openusd";
-  version = "24.11";
+  version = "25.02a";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
     tag = "v${version}";
-    hash = "sha256-ugTb28DAn8D3URxCyGeptf7F3YpL7bX4++lyVN+apas=";
+    hash = "sha256-QFwG6kOLM+R+QIAozk/Dbldj8LRt9kCJv0W/EGHkq6Q=";
   };
 
   stdenv = python.stdenv;
@@ -72,19 +72,6 @@ buildPythonPackage rec {
       url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/a07a6b4d1da19bfc499db49641d74fb7c1a71e9b.patch?full_index=1";
       hash = "sha256-Gww6Ll2nKwpcxMY9lnf5BZ3eqUWz1rik9P3mPKDOf+Y=";
     })
-    # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442
-    # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1
-    (fetchpatch {
-      name = "explicitly-adding-template-keyword.patch";
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/274cf7c6fe1c121d095acd38dd1a33214e0c8448.patch?full_index=1";
-      hash = "sha256-nlw7o2jVWV9f1Lzl32UXcRVXcWnfyMNv9Mp4SVgFvyw=";
-    })
-    # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 2
-    (fetchpatch {
-      name = "fix-removes-unused-path.patch";
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/5a6437e44269534bfde0c35cc2c7bdef087b70e8.patch?full_index=1";
-      hash = "sha256-X2v14U0pJjd4IMD8viXK2/onVFqUabJTXwDGRFKDZ+g=";
-    })
   ];
 
   env.OSL_LOCATION = "${osl}";