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 1/4] 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 2/4] 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 3/4] 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 4/4] 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 ]; }; }