From ca985cc40fbca1dde70ead4f292f1362b75696a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 21:58:17 -0800 Subject: [PATCH 1/4] igraph: 0.9.4 -> 0.9.5 https://github.com/igraph/igraph/releases/tag/0.9.5 --- pkgs/development/libraries/igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 03573716fa35..159943d8db4b 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk="; + sha256 = "sha256-R5v1nbfYyIOzdw7LmkGQE4yVxpTVs6YF62jkfFrA1z8="; }; # Normally, igraph wants us to call bootstrap.sh, which will call From f1d204a88011a1f8f182d38d229ff5a19c59a001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 21:59:07 -0800 Subject: [PATCH 2/4] python3Packages.python-igraph: 0.9.6 -> 0.9.8 --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index ce5073ed087e..91e676602360 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.6"; + version = "0.9.8"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "sha256-x/BUlMmSgjY2v6bVKPxmz86OCz6xgRUcfSqI3vV9MPs="; + sha256 = "sha256-RtvT5/LZ/xP68yBB7DDKJGeNCiX4HyPTCuk+Ijd2nFs="; }; nativeBuildInputs = [ From 63acfd5685519046dd9e4828121f11ad9b4816ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Nov 2021 22:03:39 -0800 Subject: [PATCH 3/4] python3Packages.python-igraph: rename to igraph https://igraph.org/2021/10/29/igraph-0.9.8-python.html --- pkgs/development/python-modules/cozy/default.nix | 4 ++-- .../development/python-modules/explorerscript/default.nix | 4 ++-- .../python-modules/{python-igraph => igraph}/default.nix | 0 pkgs/development/python-modules/kmapper/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 8 ++++---- 6 files changed, 11 insertions(+), 10 deletions(-) rename pkgs/development/python-modules/{python-igraph => igraph}/default.nix (100%) diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index fcd002f762d7..8787ca368f1a 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, isPy3k, fetchFromGitHub, lib, - z3, ply, python-igraph, oset, ordered-set, dictionaries, setuptools }: + z3, ply, igraph, oset, ordered-set, dictionaries, setuptools }: buildPythonPackage { pname = "cozy"; @@ -7,7 +7,7 @@ buildPythonPackage { disabled = !isPy3k; propagatedBuildInputs = [ - setuptools z3 ply python-igraph oset ordered-set dictionaries + setuptools z3 ply igraph oset ordered-set dictionaries ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index b0f1a16fe421..fe23b7182346 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, python-igraph }: +{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, igraph }: buildPythonPackage rec { pname = "explorerscript"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; }; - propagatedBuildInputs = [ antlr4-python3-runtime python-igraph ]; + propagatedBuildInputs = [ antlr4-python3-runtime igraph ]; checkInputs = [ pygments ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix similarity index 100% rename from pkgs/development/python-modules/python-igraph/default.nix rename to pkgs/development/python-modules/igraph/default.nix diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 630c025e0936..c3418b2c5c94 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -8,7 +8,7 @@ , pytestCheckHook , networkx , matplotlib -, python-igraph +, igraph , plotly , ipywidgets }: @@ -35,7 +35,7 @@ buildPythonPackage rec { pytestCheckHook networkx matplotlib - python-igraph + igraph plotly ipywidgets ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3b7be354942f..d34bb7d260d7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -75,6 +75,7 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68039eac66fd..140c8ccfefc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3692,6 +3692,10 @@ in { ignite = callPackage ../development/python-modules/ignite { }; + igraph = callPackage ../development/python-modules/igraph { + inherit (pkgs) igraph; + }; + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; ijson = callPackage ../development/python-modules/ijson { }; @@ -7495,10 +7499,6 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; - python-igraph = callPackage ../development/python-modules/python-igraph { - inherit (pkgs) igraph; - }; - pythonix = callPackage ../development/python-modules/pythonix { nix = pkgs.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; From 5f757db908b32749c8ca291a728c58e9113228d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Nov 2021 18:10:47 -0800 Subject: [PATCH 4/4] python3Packages.explorerscript: fix build with renamed python-igraph --- .../python-modules/explorerscript/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index fe23b7182346..a77c31e26a63 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, igraph }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, antlr4-python3-runtime +, igraph +, pygments +}: buildPythonPackage rec { pname = "explorerscript"; @@ -11,6 +18,14 @@ buildPythonPackage rec { sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; }; + patches = [ + # https://github.com/SkyTemple/ExplorerScript/pull/17 + (fetchpatch { + url = "https://github.com/SkyTemple/ExplorerScript/commit/47d8b3d246881d675a82b4049b87ed7d9a0e1b15.patch"; + sha256 = "0sadw9l2nypl2s8lw526lvbdj4rzqdvrjncx4zxxgyp3x47csb48"; + }) + ]; + propagatedBuildInputs = [ antlr4-python3-runtime igraph ]; checkInputs = [ pygments ];