igraph: 0.10.13 -> 0.10.15 (#354144)

This commit is contained in:
Robert Schütz 2024-11-19 16:30:53 -08:00 committed by GitHub
commit 4ba8b30cb0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 19 deletions

View File

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

View File

@ -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"
# Doesnt 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 ];
};
}

View File

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