From f00ef5e5b8262693be331fe59000e66b146c8501 Mon Sep 17 00:00:00 2001 From: Evelyn Alicke Date: Sun, 20 Oct 2024 13:05:29 +0200 Subject: [PATCH] makehuman: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/makehuman/default.nix | 37 ++------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix index 005a97c1e5c9..b9394aacb6f5 100644 --- a/pkgs/applications/misc/makehuman/default.nix +++ b/pkgs/applications/misc/makehuman/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "makehuman"; - version = "1.2.0"; + version = "1.3.0"; source = fetchFromGitHub { owner = "makehumancommunity"; repo = "makehuman"; rev = "v${version}"; - hash = "sha256-mCv6H0B7b4uxozpNHkKsG+Is2H0QYEJnnzKCHixhBpY="; + hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4="; name = "${pname}-source"; }; @@ -36,39 +36,6 @@ stdenv.mkDerivation rec { name = "${pname}-assets-source"; }; - patches = [ - # work with numpy>=1.24 - (fetchpatch { - name = "fix-compile_targets.py-when-using-numpy-1.24.0-or-newer"; - url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/220.patch"; - hash = "sha256-ip7U83cCBrl+4gM1GZ2QQIER5Qur6HRu3a/TnHqk//g="; - }) - # crash related to collections.Callable -> collections.abc.Callable - (fetchpatch { - name = "remove-unnecessary-compatibility-test"; - url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/188.patch"; - hash = "sha256-HGrk3n7rhV4YgK8mNUdfHwQl8dFT8yuzjxorvwfMmJw="; - }) - # some OpenGL issue causing blank windows on recent Qt - (fetchpatch { - name = "qt-opengl-update-from-qglwidget-to-qopenglwidget-to-fix-blank"; - url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/197.patch"; - hash = "sha256-fEqBwg1Jd36nKWIT9XPr6Buj1N3AmTQg2LBaoX3eTxw="; - }) - # multisampling issue - (fetchpatch { - name = "switch-default-for-multisampling-and-disable-sample-buffers"; - url = "https://github.com/makehumancommunity/makehuman/commit/c47b884028a24eb190d097e7523a3059e439cb6f.patch"; - hash = "sha256-tknQHX9qQYH15gyOLNhxfO3bsFVIv3Z1F7ZXD1IT1h4="; - }) - # PyQt >= 5.12 - (fetchpatch { - name = "fix-scrolling-issue-on-pyqt5>=5.12"; - url = "https://github.com/makehumancommunity/makehuman/commit/02c4269a2d4c57f68159fe8f437a8b1978b99099.patch"; - hash = "sha256-yR5tZcELX0N83PW/vS6yB5xKoZcHhVp48invlu7quWM="; - }) - ]; - srcs = [ source assets