diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/igraph | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/igraph')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/igraph/default.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/igraph/default.nix b/nixpkgs/pkgs/development/libraries/igraph/default.nix index 441646c43955..e36793debdff 100644 --- a/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -12,7 +12,9 @@ , lapack , libxml2 , libxslt +, llvmPackages , pkg-config +, plfit , python3 , sourceHighlight , suitesparse @@ -21,19 +23,15 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.7"; + version = "0.9.9"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-SL9PcT18vFvykCv4VRXxXtlcDAcybmwEImnnKXMciFQ="; + hash = "sha256-Zb9F4kFUNA/MtoYYEKGJ5JyKxtG0DHSdGaUpDLKmAAc="; }; - # Normally, igraph wants us to call bootstrap.sh, which will call - # tools/getversion.sh. Instead, we're going to put the version directly - # where igraph wants, and then let autoreconfHook do the rest of the - # bootstrap. ~ C. postPatch = '' echo "${version}" > IGRAPH_VERSION '' + lib.optionalString stdenv.isAarch64 '' @@ -65,7 +63,10 @@ stdenv.mkDerivation rec { gmp lapack libxml2 + plfit suitesparse + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp ]; cmakeFlags = [ @@ -75,8 +76,10 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_GLPK=OFF" "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" "-DIGRAPH_USE_INTERNAL_GMP=OFF" + "-DIGRAPH_USE_INTERNAL_PLFIT=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" "-DIGRAPH_GRAPHML_SUPPORT=ON" + "-DIGRAPH_OPENMP_SUPPORT=ON" "-DIGRAPH_ENABLE_LTO=AUTO" "-DIGRAPH_ENABLE_TLS=ON" "-DBUILD_SHARED_LIBS=ON" @@ -84,13 +87,6 @@ stdenv.mkDerivation rec { doCheck = true; - # needed to find libigraph, and liblas on darwin - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src" - '' else '' - export LD_LIBRARY_PATH="$PWD/src" - ''; - postInstall = '' mkdir -p "$out/share" cp -r doc "$out/share" @@ -103,6 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The network analysis package"; homepage = "https://igraph.org/"; + changelog = "https://github.com/igraph/igraph/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ MostAwesomeDude dotlambda ]; |