dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #325655 from dotlambda/python3Packages.igraph

Browse Source 
python312Packages.igraph: 0.11.5 -> 0.11.6
This commit is contained in:
Robert Schütz 2024-07-15 06:24:31 -07:00 committed by GitHub
commit bc8438b2dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 72 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/skytemple/default.nix
View File

@ -15,11 +15,13 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
repo = "skytemple";
rev = "refs/tags/${version}";
hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI=";
};
build-system = with python3Packages; [ setuptools ];
buildInputs = [
gtk3
gtksourceview4
@ -34,7 +36,12 @@ python3Packages.buildPythonApplication rec {
wrapGAppsHook3
];
propagatedBuildInputs = with python3Packages; [
pythonRelaxDeps = [
"skytemple-files"
"skytemple-ssb-debugger"
];
dependencies = with python3Packages; [
cairosvg
natsort
ndspy

17
pkgs/development/python-modules/gbulb/default.nix
View File

@ -3,6 +3,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools-scm,
pygobject3,
pytestCheckHook,
gtk3,
@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "gbulb";
version = "0.6.5";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "beeware";
@ -21,10 +22,16 @@ buildPythonPackage rec {
hash = "sha256-03Ott+V3Y4+Y72Llsug5coqG3C+pjAdLkPYbaY/6Uow=";
};
propagatedBuildInputs = [
pygobject3
gtk3
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "==" ">="
'';
build-system = [ setuptools-scm ];
dependencies = [ pygobject3 ];
buildInputs = [ gtk3 ];
nativeCheckInputs = [
pytestCheckHook

17
pkgs/development/python-modules/igraph/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "igraph";
version = "0.11.5";
version = "0.11.6";
disabled = pythonOlder "3.8";
@ -25,21 +25,24 @@ buildPythonPackage rec {
owner = "igraph";
repo = "python-igraph";
rev = "refs/tags/${version}";
hash = "sha256-nfXCAjTKxtslVk17h60+v/JQusQTmaTRCPvvFG4/OPk=";
postFetch = ''
# export-subst prevents reproducability
rm $out/.git_archival.json
'';
hash = "sha256-DXYNFSvmKiulMnWL8w5l9lWGtS9Sff/Hn4x538nrvzo=";
};
postPatch = ''
rm -r vendor
'';
nativeBuildInputs = [
pkg-config
setuptools
];
nativeBuildInputs = [ pkg-config ];
build-system = [ setuptools ];
buildInputs = [ igraph ];
propagatedBuildInputs = [ texttable ];
dependencies = [ texttable ];
passthru.optional-dependencies = {
cairo = [ cairocffi ];

7
pkgs/development/python-modules/skytemple-dtef/default.nix
View File

@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pillow,
pytestCheckHook,
pythonOlder,
@ -17,12 +18,14 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
repo = "skytemple-dtef";
rev = version;
hash = "sha256-vVh4WRjx/iFJnTZC7D/OCi0gOwKaXs/waVXUEu5Cda8=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
pillow
skytemple-files
];

55
pkgs/development/python-modules/skytemple-files/default.nix
View File

@ -3,6 +3,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
appdirs,
dungeon-eos,
explorerscript,
@ -10,12 +11,9 @@
pillow,
setuptools,
skytemple-rust,
tilequant,
pyyaml,
pmdsky-debug-py,
range-typed-integers,
importlib-resources,
typing-extensions,
pythonOlder,
# optional dependancies for SpriteCollab
aiohttp,
@ -31,43 +29,48 @@
buildPythonPackage rec {
pname = "skytemple-files";
version = "1.6.5";
version = "1.7.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
repo = "skytemple-files";
rev = version;
hash = "sha256-y6VHRfwQNoehp06BoZXuprYtsiGgoNL4rztJw40P4FI=";
hash = "sha256-G2AAQ+eRnsMTWrAF0SNmxUmOoHTSMCuSy1kUZbFy8y0=";
# Most patches are in submodules
fetchSubmodules = true;
};
patches = [
(fetchpatch2 {
name = "fix-tests.patch";
url = "https://github.com/SkyTemple/skytemple-files/commit/854e5514e6c63ba082618d14643e3a4b30a6c2b2.patch";
hash = "sha256-dZM9n332IMiZIp3QL0Z+yJrIW1SJsqpjh7i3VRFFf7w=";
})
];
postPatch = ''
substituteInPlace skytemple_files/patch/arm_patcher.py skytemple_files/data/data_cd/armips_importer.py \
--replace "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\""
--replace-fail "exec_name = os.getenv(\"SKYTEMPLE_ARMIPS_EXEC\", f\"{prefix}armips\")" "exec_name = \"${armips}/bin/armips\""
'';
build-system = [ setuptools ];
buildInputs = [ armips ];
propagatedBuildInputs =
[
appdirs
dungeon-eos
explorerscript
ndspy
pillow
setuptools
skytemple-rust
tilequant
pyyaml
pmdsky-debug-py
range-typed-integers
]
++ lib.optionals (pythonOlder "3.9") [
importlib-resources
typing-extensions
];
dependencies = [
appdirs
dungeon-eos
explorerscript
ndspy
pillow
skytemple-rust
pyyaml
pmdsky-debug-py
range-typed-integers
];
passthru.optional-dependencies = {
spritecollab = [
@ -78,7 +81,7 @@ buildPythonPackage rec {
] ++ gql.optional-dependencies.aiohttp;
};
checkInputs = [
nativeCheckInputs = [
pytestCheckHook
parameterized
xmldiff

11
pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
View File

@ -2,6 +2,7 @@
buildPythonPackage,
explorerscript,
fetchFromGitHub,
setuptools,
gobject-introspection,
gtk3,
gtksourceview4,
@ -23,16 +24,18 @@
buildPythonPackage rec {
pname = "skytemple-ssb-debugger";
version = "1.6.4";
version = "1.7.0";
pyproject = true;
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
repo = "skytemple-ssb-debugger";
rev = version;
hash = "sha256-whnwFwPYPGF+UtjrzRKgXJNPsUGvmE+HHKJcPf0qcuA=";
hash = "sha256-S38Nw7FntacEdwdGu2d/zUKOsGostVy9+U2KPxlvI5Q=";
};
build-system = [ setuptools ];
buildInputs = [
gtk3
gtksourceview4
@ -41,7 +44,7 @@ buildPythonPackage rec {
gobject-introspection
wrapGAppsHook3
];
propagatedBuildInputs = [
dependencies = [
explorerscript
ndspy
nest-asyncio