summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-04-17 19:37:31 +0200
committerGitHub <noreply@github.com>2021-04-17 19:37:31 +0200
commitc00fa57d590ba85540e2b995166e91fa7b89d258 (patch)
tree68345e2483cb96cb170969f0619a5b7d4daf76fc
parentd6e1af5d9c0e040c40eafcc3b4637f73e22edea2 (diff)
parent63bc9709d2554b956d97ec284c8dbb7ca484e637 (diff)
downloadnixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.tar
nixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.tar.gz
nixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.tar.bz2
nixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.tar.lz
nixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.tar.xz
nixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.tar.zst
nixpkgs-c00fa57d590ba85540e2b995166e91fa7b89d258.zip
Merge pull request #119447 from dotlambda/igraph-0.9.2
igraph: 0.9.1 -> 0.9.2
-rw-r--r--pkgs/development/libraries/igraph/default.nix17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index bcd0fcee92c..86b8b7130ff 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , arpack
 , bison
 , blas
@@ -22,23 +21,15 @@
 
 stdenv.mkDerivation rec {
   pname = "igraph";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "igraph";
     repo = pname;
     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
   # tools/getversion.sh. Instead, we're going to put the version directly
   # where igraph wants, and then let autoreconfHook do the rest of the
@@ -55,7 +46,9 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "doc" ];
 
   nativeBuildInputs = [
+    bison
     cmake
+    flex
     fop
     libxml2
     libxslt
@@ -67,9 +60,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     arpack
-    bison
     blas
-    flex
     glpk
     gmp
     lapack