From bb4281dcaa318e63b0315dd2122fd60522c682a9 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 8 Feb 2025 19:21:35 +0100 Subject: [PATCH 1/2] Revert "python3Packages.materialx: 1.38.10 -> 1.39.1" This reverts commit e4d1e54749df0eaed81325315cb381578d9d07ed. This is necessary, because 1.39 introduces breaking changes and downstream software (e.g. openUSD) needs to adapt, first. See https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160 and https://github.com/NixOS/nixpkgs/issues/380230 --- pkgs/development/python-modules/materialx/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index e6adc281de8e..b3ad7bbe0804 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "materialx"; - version = "1.39.1"; + version = "1.38.10"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; - tag = "v${version}"; - hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s="; + rev = "v${version}"; + hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; }; format = "other"; @@ -65,7 +65,7 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; description = "Open standard for representing rich material and look-development content in computer graphics"; homepage = "https://materialx.org"; maintainers = [ lib.maintainers.gador ]; From 00c386ebc854ea4299b8aa6504a18552130a7652 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 8 Feb 2025 19:26:14 +0100 Subject: [PATCH 2/2] python312Packages.materialx: do not auto-update Signed-off-by: Florian Brandes --- pkgs/development/python-modules/materialx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index b3ad7bbe0804..5d2c09dfef7f 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -64,6 +64,12 @@ buildPythonPackage rec { ln -s $out/python $target_dir ''; + # Update to 1.39 has major API changes and downstream software + # needs to adapt, first. So, do not include in mass updates. For reference, see + # https://github.com/NixOS/nixpkgs/pull/326466#issuecomment-2293029160 + # and https://github.com/NixOS/nixpkgs/issues/380230 + passthru.skipBulkUpdate = true; + meta = { changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; description = "Open standard for representing rich material and look-development content in computer graphics";