Merge pull request #119447 from dotlambda/igraph-0.9.2

igraph: 0.9.1 -> 0.9.2
This commit is contained in:
Sandro 2021-04-17 19:37:31 +02:00 committed by GitHub
commit c00fa57d59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions

View File

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, arpack , arpack
, bison , bison
, blas , blas
@ -22,23 +21,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igraph"; pname = "igraph";
version = "0.9.1"; version = "0.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "igraph"; owner = "igraph";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-i6Zg6bfHZ9NHwqCouX9m9YqD0VtiWW8DEkxS0hdUyIE="; sha256 = "sha256-Ylw02Mz9H4wIWfq59za/X7xfhgW9o0DNU55nLFqeUeo=";
}; };
patches = [
(fetchpatch {
name = "pkg-config-paths.patch";
url = "https://github.com/igraph/igraph/commit/980521cc948777df471893f7b6de8f3e3916a3c0.patch";
sha256 = "0mbq8v5h90c3dhgmyjazjvva3rn57qhnv7pkc9hlbqdln9gpqg0g";
})
];
# Normally, igraph wants us to call bootstrap.sh, which will call # Normally, igraph wants us to call bootstrap.sh, which will call
# tools/getversion.sh. Instead, we're going to put the version directly # tools/getversion.sh. Instead, we're going to put the version directly
# where igraph wants, and then let autoreconfHook do the rest of the # where igraph wants, and then let autoreconfHook do the rest of the
@ -55,7 +46,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ]; outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ nativeBuildInputs = [
bison
cmake cmake
flex
fop fop
libxml2 libxml2
libxslt libxslt
@ -67,9 +60,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
arpack arpack
bison
blas blas
flex
glpk glpk
gmp gmp
lapack lapack