From 08bed55e78daec2fb4cbdc78779cfcbd900c92ad Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 13:01:45 -0500 Subject: [PATCH 01/12] febio: darwin sdk refactor --- pkgs/by-name/fe/febio/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 3f70ad711d76..5ba5c377f0ad 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -1,23 +1,19 @@ { lib, stdenv, - overrideSDK, fetchFromGitHub, fetchpatch2, substituteAll, + apple-sdk_11, cmake, + darwinMinVersionHook, ninja, zlib, - darwin, mklSupport ? true, mkl, }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; -in - -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "FEBio"; version = "4.7"; @@ -57,9 +53,8 @@ stdenv'.mkDerivation (finalAttrs: { [ zlib ] ++ lib.optionals mklSupport [ mkl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.CoreVideo - darwin.apple_sdk.frameworks.Accelerate + apple-sdk_11 + (darwinMinVersionHook "10.15") ]; meta = { From c970f0f7cd60d9d98b11729e5a213711bdabff28 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 3 Nov 2024 17:40:07 -0600 Subject: [PATCH 02/12] febio-studio: darwin sdk refactor --- pkgs/by-name/fe/febio-studio/package.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index b9605413575d..e7f6f35f01b7 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - overrideSDK, fetchFromGitHub, cmake, ninja, @@ -10,6 +9,8 @@ qt6Packages, febio, glew, + apple-sdk_11, + darwinMinVersionHook, sshSupport ? true, openssl, libssh, @@ -23,18 +24,7 @@ withCadFeatures ? false, }: -let - stdenv' = - if stdenv.hostPlatform.isDarwin then - overrideSDK stdenv { - darwinSdkVersion = "11.0"; - darwinMinVersion = "10.15"; - } - else - stdenv; -in - -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "febio-studio"; version = "2.7"; @@ -76,7 +66,11 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optional tetgenSupport tetgen ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional dicomSupport dcmtk; + ++ lib.optional dicomSupport dcmtk + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + (darwinMinVersionHook "10.15") + ]; meta = { description = "FEBio Suite Solver"; From c04916cf323d4b092f201137f26dfb51518444a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Nov 2024 21:42:17 -0800 Subject: [PATCH 03/12] igraph: 0.10.13 -> 0.10.15 Diff: https://github.com/igraph/igraph/compare/0.10.13...0.10.15 Changelog: https://github.com/igraph/igraph/blob/0.10.15/CHANGELOG.md --- pkgs/by-name/ig/igraph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix index 0501fe4ac2d3..fecc942e02e6 100644 --- a/pkgs/by-name/ig/igraph/package.nix +++ b/pkgs/by-name/ig/igraph/package.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.13"; + version = "0.10.15"; src = fetchFromGitHub { owner = "igraph"; repo = "igraph"; rev = finalAttrs.version; - hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U="; + hash = "sha256-TSAVRLeOWh3IQ9X0Zr4CQS+h1vTeUZnzMp/IYujGMn0="; }; postPatch = '' From a23620b20f3fc2db4c1f50804a6aa84d54190433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 29 Oct 2024 20:49:18 -0700 Subject: [PATCH 04/12] python312Packages.igraph: 0.11.6 -> 0.11.8 Diff: https://github.com/igraph/python-igraph/compare/refs/tags/0.11.6...0.11.8 Changelog: https://github.com/igraph/python-igraph/blob/refs/tags/0.11.8/CHANGELOG.md --- pkgs/development/python-modules/igraph/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 48983a575805..23fee7d17099 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.11.6"; + version = "0.11.8"; disabled = pythonOlder "3.8"; @@ -29,11 +29,15 @@ buildPythonPackage rec { # export-subst prevents reproducability rm $out/.git_archival.json ''; - hash = "sha256-DXYNFSvmKiulMnWL8w5l9lWGtS9Sff/Hn4x538nrvzo="; + hash = "sha256-FEp9kwUAPSAnGcAuxApAq1AXiT0klXuXE2M6xNVilRg="; }; postPatch = '' rm -r vendor + + # TODO remove starting with 0.11.9 + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=64,<72.2.0" setuptools ''; nativeBuildInputs = [ pkg-config ]; From 3605e392d9533e5b691d66faa8e655ff7351dcce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Nov 2024 22:24:54 -0800 Subject: [PATCH 05/12] python312Packages.explorerscript: unpin igraph --- pkgs/development/python-modules/explorerscript/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 6f1b346274a2..0eae37829d88 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -49,6 +49,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + pythonRelaxDeps = [ + "igraph" + ]; + propagatedBuildInputs = [ igraph pybind11 From af5d97a9305b792b7029add1d362b6851c8d5fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 8 Nov 2024 22:31:52 -0800 Subject: [PATCH 06/12] python312Packages.explorerscript: modernize --- .../python-modules/explorerscript/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 0eae37829d88..f4e7d21aeb33 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -7,7 +7,6 @@ scikit-build-core, pybind11, ninja, - ruff, cmake, pytestCheckHook, setuptools, @@ -20,31 +19,27 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; - rev = version; + repo = "explorerscript"; + rev = "refs/tags/${version}"; hash = "sha256-cKEceWr7XmZbuomPOmjQ32ptAjz3LZDQBWAgZEFadDY="; # Include a pinned antlr4 fork used as a C++ library fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ setuptools scikit-build-core ninja cmake - ruff + pybind11 ]; # The source include some auto-generated ANTLR code that could be recompiled, but trying that resulted in a crash while decompiling unionall.ssb. # We thus do not rebuild them. postPatch = '' - substituteInPlace Makefile \ - --replace-fail ./generate_parser_bindings.py "python3 ./generate_parser_bindings.py" - - # Doesn’t detect that package for some reason substituteInPlace pyproject.toml \ - --replace-fail "\"scikit-build-core<=0.9.8\"," "" + --replace-fail "scikit-build-core<=0.9.8" scikit-build-core ''; dontUseCmakeConfigure = true; @@ -53,9 +48,8 @@ buildPythonPackage rec { "igraph" ]; - propagatedBuildInputs = [ + dependencies = [ igraph - pybind11 ]; optional-dependencies.pygments = [ pygments ]; @@ -64,10 +58,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "explorerscript" ]; - meta = with lib; { + meta = { homepage = "https://github.com/SkyTemple/explorerscript"; description = "Programming language + compiler/decompiler for creating scripts for Pokémon Mystery Dungeon Explorers of Sky"; - license = licenses.mit; - maintainers = with maintainers; [ marius851000 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marius851000 ]; }; } From 2e61f3236def89fc736995fd52555fe952cf5ac5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 Nov 2024 10:38:48 -0600 Subject: [PATCH 07/12] febio-studio: fix qt 6.8 build Use a commit from upstream that hasn't been released to support qt 6.8 --- pkgs/by-name/fe/febio-studio/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index e7f6f35f01b7..a875cfb0e635 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -11,6 +11,7 @@ glew, apple-sdk_11, darwinMinVersionHook, + fetchpatch, sshSupport ? true, openssl, libssh, @@ -35,7 +36,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU="; }; - patches = [ ./cmake-install.patch ]; + patches = [ + ./cmake-install.patch + # Fix qt 6.8 compile, can be removed after next release + (fetchpatch { + url = "https://github.com/febiosoftware/FEBioStudio/commit/15524d958a6f5ef81ccee58b4efa1ea25de91543.patch"; + hash = "sha256-LRToK1/RQC+bLXgroDTQOV6H8pI+IZ38Y0nsl/Fz1WE="; + }) + ]; cmakeFlags = [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ] From 8d286f8b476aa4943e7709d933fc4d098d7047c9 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 18 Nov 2024 02:05:43 +0800 Subject: [PATCH 08/12] alist: 3.38.0 -> 3.39.2 https://github.com/AlistGo/alist/releases/tag/v3.39.2 https://github.com/AlistGo/alist-web/releases/tag/3.39.2 --- pkgs/by-name/al/alist/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index b89eb1387968..4e92f00123e4 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -10,13 +10,13 @@ }: buildGoModule rec { pname = "alist"; - version = "3.38.0"; + version = "3.39.2"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; rev = "refs/tags/v${version}"; - hash = "sha256-HF5T/TZXiyT186qZyzz+m0K9ajF1wk8YAZljcq5ccWM="; + hash = "sha256-ayIbmoemaDKZu+jYJ33GXq5XORNn6rJ3yOpDgFeXA/4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,11 +30,11 @@ buildGoModule rec { }; web = fetchurl { url = "https://github.com/AlistGo/alist-web/releases/download/${version}/dist.tar.gz"; - hash = "sha256-jHbWhjvHfgtdocuuELbOwrMzL8tOQfBVdH9MxasEwGo="; + hash = "sha256-2ZgxWv9VROfXJIIU0Co7BKkjZr8KxQ+0eRsjgz6LVDo="; }; proxyVendor = true; - vendorHash = "sha256-Q5E86bNedXOqMKS3WrXicWg27vnjyGao0nE34Ws2l9E="; + vendorHash = "sha256-S8TPu+pOljrA8GAeCzxgv09pb5rauSYvRm8gt8oMPTs="; buildInputs = [ fuse ]; From 551322fdc4c9a957f21af663027d880d6af8f7d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Nov 2024 06:55:42 +0000 Subject: [PATCH 09/12] python312Packages.transformers: 4.46.2 -> 4.46.3 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 746b27514632..51319c03b41f 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.46.2"; + version = "4.46.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-5bYjgrW2ITJ/bc8BP/tWjzwLrLQHgvKSVyUCNsRniFM="; + hash = "sha256-unQ1BypPv3fcFLCq4yoyat4pNy4ub5kgKfQRnfhuaGI="; }; build-system = [ setuptools ]; From 54c4207c53f79560d113f4853135879184204297 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 Nov 2024 12:13:51 -0600 Subject: [PATCH 10/12] febio: 4.7 -> 4.8 --- pkgs/by-name/fe/febio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 5ba5c377f0ad..96657c506c0f 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "FEBio"; - version = "4.7"; + version = "4.8"; src = fetchFromGitHub { owner = "febiosoftware"; repo = "FEBio"; rev = "v${finalAttrs.version}"; - hash = "sha256-RRdIOyXg4jYW76ABfJdMfVtCYMLYFdvyOI98nHXCof8="; + hash = "sha256-x2QYnMMiGd2x2jvBMLBK7zdJv3yzYHkJ6a+0xes6OOk="; }; patches = [ From 8f4995f169f45e798c2243f033b6f0f4dd55e772 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 Nov 2024 12:14:00 -0600 Subject: [PATCH 11/12] febio-studio: 2.7 -> 2.8.1 --- pkgs/by-name/fe/febio-studio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index a875cfb0e635..13271dc23e43 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "febio-studio"; - version = "2.7"; + version = "2.8.1"; src = fetchFromGitHub { owner = "febiosoftware"; repo = "FEBioStudio"; rev = "v${finalAttrs.version}"; - hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU="; + hash = "sha256-ynKo7WK529146Tk//PO5tMsqvfKM4nq3fgPXMGjWwIk="; }; patches = [ From 97fc62f6c7c91ead0bc39285c352fd809ba614ba Mon Sep 17 00:00:00 2001 From: cloudripper <70971768+cloudripper@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:30:08 -0800 Subject: [PATCH 12/12] maintainers: update email for cloudripper --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba5167d7d307..9e4cf010da5e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4186,7 +4186,7 @@ matrix = "@clot27:matrix.org"; }; cloudripper = { - email = "other.wing8806@fastmail.com"; + email = "dev+nixpkgs@cldrpr.com"; github = "cloudripper"; githubId = 70971768; name = "cloudripper";