Merge staging-next into staging

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";

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 ];
 

pkgs/by-name/fe/febio-studio/package.nix

@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  overrideSDK,
   fetchFromGitHub,
   cmake,
   ninja,
@@ -10,6 +9,9 @@
   qt6Packages,
   febio,
   glew,
+  apple-sdk_11,
+  darwinMinVersionHook,
+  fetchpatch,
   sshSupport ? true,
   openssl,
   libssh,
@@ -23,29 +25,25 @@
   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";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "febiosoftware";
     repo = "FEBioStudio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU=";
+    hash = "sha256-ynKo7WK529146Tk//PO5tMsqvfKM4nq3fgPXMGjWwIk=";
   };
 
-  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}") ]
@@ -76,7 +74,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";

pkgs/by-name/fe/febio/package.nix

@@ -1,31 +1,27 @@
 {
   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";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "febiosoftware";
     repo = "FEBio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RRdIOyXg4jYW76ABfJdMfVtCYMLYFdvyOI98nHXCof8=";
+    hash = "sha256-x2QYnMMiGd2x2jvBMLBK7zdJv3yzYHkJ6a+0xes6OOk=";
   };
 
   patches = [
@@ -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 = {

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 = ''

pkgs/development/python-modules/explorerscript/default.nix

@@ -7,7 +7,6 @@
   scikit-build-core,
   pybind11,
   ninja,
-  ruff,
   cmake,
   pytestCheckHook,
   setuptools,
@@ -20,38 +19,37 @@ 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;
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "igraph"
+  ];
+
+  dependencies = [
     igraph
-    pybind11
   ];
 
   optional-dependencies.pygments = [ pygments ];
@@ -60,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 ];
   };
 }

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 ];

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 ];