nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 22:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145592 from dotlambda/igraph-0.9.5

Browse Source 
igraph: 0.9.4 -> 0.9.5
This commit is contained in:
Robert Schütz 2021-11-16 23:29:56 -08:00 committed by GitHub
commit 7143a8d4ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/igraph/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igraph"; pname = "igraph";
version = "0.9.4"; version = "0.9.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "igraph"; owner = "igraph";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk="; sha256 = "sha256-R5v1nbfYyIOzdw7LmkGQE4yVxpTVs6YF62jkfFrA1z8=";
}; };
# Normally, igraph wants us to call bootstrap.sh, which will call # Normally, igraph wants us to call bootstrap.sh, which will call

4
pkgs/development/python-modules/cozy/default.nix
View File

@ -1,5 +1,5 @@
{ buildPythonPackage, isPy3k, fetchFromGitHub, lib, { buildPythonPackage, isPy3k, fetchFromGitHub, lib,
z3, ply, python-igraph, oset, ordered-set, dictionaries, setuptools }: z3, ply, igraph, oset, ordered-set, dictionaries, setuptools }:
buildPythonPackage { buildPythonPackage {
pname = "cozy"; pname = "cozy";
@ -7,7 +7,7 @@ buildPythonPackage {
disabled = !isPy3k; disabled = !isPy3k;
propagatedBuildInputs = [ propagatedBuildInputs = [
setuptools z3 ply python-igraph oset ordered-set dictionaries setuptools z3 ply igraph oset ordered-set dictionaries
]; ];
src = fetchFromGitHub { src = fetchFromGitHub {

19
pkgs/development/python-modules/explorerscript/default.nix
View File

@ -1,4 +1,11 @@
{ lib, buildPythonPackage, fetchFromGitHub, antlr4-python3-runtime, pygments, python-igraph }: { lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, antlr4-python3-runtime
, igraph
, pygments
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "explorerscript"; pname = "explorerscript";
@ -11,7 +18,15 @@ buildPythonPackage rec {
sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1"; sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1";
}; };
propagatedBuildInputs = [ antlr4-python3-runtime python-igraph ]; 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 ]; checkInputs = [ pygments ];
meta = with lib; { meta = with lib; {

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

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-igraph"; pname = "python-igraph";
version = "0.9.6"; version = "0.9.8";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "igraph"; owner = "igraph";
repo = "python-igraph"; repo = "python-igraph";
rev = version; rev = version;
sha256 = "sha256-x/BUlMmSgjY2v6bVKPxmz86OCz6xgRUcfSqI3vV9MPs="; sha256 = "sha256-RtvT5/LZ/xP68yBB7DDKJGeNCiX4HyPTCuk+Ijd2nFs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/kmapper/default.nix
View File

@ -8,7 +8,7 @@
, pytestCheckHook , pytestCheckHook
, networkx , networkx
, matplotlib , matplotlib
, python-igraph , igraph
, plotly , plotly
, ipywidgets , ipywidgets
}: }:
@ -35,7 +35,7 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
networkx networkx
matplotlib matplotlib
python-igraph igraph
plotly plotly
ipywidgets ipywidgets
]; ];

1
pkgs/top-level/python-aliases.nix
View File

@ -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 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 pytestquickcheck = pytest-quickcheck; # added 2021-07-20
pytestrunner = pytest-runner; # added 2021-01-04 pytestrunner = pytest-runner; # added 2021-01-04
python-igraph = igraph; # added 2021-11-11
python-lz4 = lz4; # added 2018-06-01 python-lz4 = lz4; # added 2018-06-01
python_mimeparse = python-mimeparse; # added 2021-10-31 python_mimeparse = python-mimeparse; # added 2021-10-31
python-subunit = subunit; # added 2021-09-10 python-subunit = subunit; # added 2021-09-10

8
pkgs/top-level/python-packages.nix
View File

@ -3704,6 +3704,10 @@ in {
ignite = callPackage ../development/python-modules/ignite { }; ignite = callPackage ../development/python-modules/ignite { };
igraph = callPackage ../development/python-modules/igraph {
inherit (pkgs) igraph;
};
ihatemoney = callPackage ../development/python-modules/ihatemoney { }; ihatemoney = callPackage ../development/python-modules/ihatemoney { };
ijson = callPackage ../development/python-modules/ijson { }; ijson = callPackage ../development/python-modules/ijson { };
@ -7517,10 +7521,6 @@ in {
python-http-client = callPackage ../development/python-modules/python-http-client { }; 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 { pythonix = callPackage ../development/python-modules/pythonix {
nix = pkgs.nix_2_3; nix = pkgs.nix_2_3;
meson = pkgs.meson.override { python3 = self.python; }; meson = pkgs.meson.override { python3 = self.python; };