From 1769c4bc2ce9b58a3b3814e5622740eb9e8074fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2024 10:35:49 -0800 Subject: [PATCH 1/3] igraph: fix include path in generated cmake target --- pkgs/development/libraries/igraph/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index f8232c35dc01..a39249e9bfb1 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -92,7 +92,10 @@ stdenv.mkDerivation (finalAttrs: { cp -r doc "$out/share" ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = '' + substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \ + --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\"" + '' + lib.optionalString stdenv.isDarwin '' install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib ''; From 836a4c5918eea73408d981b250613a48ce55c5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2024 10:19:14 -0800 Subject: [PATCH 2/3] libleidenalg: init at 0.11.1 --- pkgs/by-name/li/libleidenalg/package.nix | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/li/libleidenalg/package.nix diff --git a/pkgs/by-name/li/libleidenalg/package.nix b/pkgs/by-name/li/libleidenalg/package.nix new file mode 100644 index 000000000000..75cdd34efa0f --- /dev/null +++ b/pkgs/by-name/li/libleidenalg/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, igraph +}: + +stdenv.mkDerivation rec { + pname = "libleidenalg"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "vtraag"; + repo = "libleidenalg"; + rev = "refs/tags/${version}"; + hash = "sha256-hEES/OHvgN0yRDp5ZBZTCQfWr1j7s8NqE+Sp9WMHEEY="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + igraph + ]; + + meta = { + changelog = "https://github.com/vtraag/libleidenalg/blob/${version}/CHANGELOG"; + description = "C++ library of Leiden algorithm"; + homepage = "https://github.com/vtraag/libleidenalg"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ dotlambda ]; + platforms = lib.platforms.all; + }; +} From 9fc180a9da02200ab3937994a7a57a1a771f7b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Feb 2024 10:03:47 -0800 Subject: [PATCH 3/3] python311Packages.leidenalg: 0.10.1 -> 0.10.2 Changelog: https://github.com/vtraag/leidenalg/blob/0.10.2/CHANGELOG --- .../python-modules/leidenalg/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix index 336fb029c476..661ac2c71597 100644 --- a/pkgs/development/python-modules/leidenalg/default.nix +++ b/pkgs/development/python-modules/leidenalg/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , ddt -, fetchPypi +, fetchFromGitHub , igraph , igraph-c +, libleidenalg , pythonOlder , setuptools-scm , unittestCheckHook @@ -11,31 +12,29 @@ buildPythonPackage rec { pname = "leidenalg"; - version = "0.10.1"; - format = "setuptools"; + version = "0.10.2"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-RXrZaYKoC9XGVxifQt/rd+6807dEoRDlosFhjS64C0c="; + src = fetchFromGitHub { + owner = "vtraag"; + repo = "leidenalg"; + rev = "refs/tags/${version}"; + hash = "sha256-oaTV+BIB/YQBWKrVXuiIEMH/1MxPxeHhjUzbmxt6hlw="; }; - postPatch = '' - substituteInPlace ./setup.py \ - --replace "[\"/usr/include/igraph\", \"/usr/local/include/igraph\"]" \ - "[\"${igraph-c.dev}/include/igraph\"]" - - rm -r vendor - ''; - nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ + igraph-c + libleidenalg + ]; + propagatedBuildInputs = [ igraph - igraph-c ]; checkInputs = [ @@ -46,8 +45,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "leidenalg" ]; meta = with lib; { + changelog = "https://github.com/vtraag/leidenalg/blob/${version}/CHANGELOG"; description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python"; - homepage = "https://leidenalg.readthedocs.io"; + homepage = "https://github.com/vtraag/leidenalg"; license = licenses.gpl3Only; maintainers = with maintainers; [ jboy ]; };