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"; 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"; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index b9f88f3b5d51..f44a712aaf80 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,13 +66,12 @@ buildPythonPackage rec { outputs = [ "out" ] ++ lib.optional withDocs "doc"; - format = "other"; - 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="; }) ]; @@ -175,7 +175,10 @@ buildPythonPackage rec { for interchange between graphics applications. ''; homepage = "https://openusd.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ shaddydc ]; + license = lib.licenses.tost; + maintainers = with lib.maintainers; [ + shaddydc + gador + ]; }; }