Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88810a55bf32
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d38c4638ee9d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 4, 2020

  1. python3.pkgs.graph-tool: 2.27 -> 2.29 

    The dependency 'pkg-config' was renamed and the two patches have since been
included or resolved.
    @Lassulus
    Michel Weitbrecht authored and Lassulus committed Jan 4, 2020
    Copy the full SHA
    d38c463 View commit details
Showing with 5 additions and 21 deletions.
  1. +4 −20 pkgs/development/python-modules/graph-tool/2.x.x.nix
  2. +1 −1 pkgs/top-level/python-packages.nix
24 changes: 4 additions & 20 deletions pkgs/development/python-modules/graph-tool/2.x.x.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr
, pkg-config, boost, expat, scipy, cgal, gmp, mpfr
, gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
, buildPythonPackage
, fetchpatch
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "graph-tool";
format = "other";
version = "2.27";
version = "2.29";

meta = with stdenv.lib; {
description = "Python module for manipulation and statistical analysis of graphs";
@@ -21,25 +21,9 @@ buildPythonPackage rec {

src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27";
sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c";
};

patches = [
# fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509)
(fetchpatch {
name = "cgal-4.13.patch";
url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch";
sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m";
})
] ++ (lib.optionals (pythonAtLeast "3.7") [
# # python 3.7 compatibility (`async` is now reserved)
(fetchpatch {
name = "async-reserved.patch";
url = "https://git.skewed.de/count0/graph-tool/commit/0407f41a35b6be7c670927fb5dc578cbd0e88be4.patch";
sha256 = "1fklznhmfvbb3ykwzyf8p2hiczby6y7r0xnkkjl2jkxlvr24000q";
})
]);

configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
"--with-boost-libdir=${boost}/lib"
@@ -48,7 +32,7 @@ buildPythonPackage rec {
"--enable-openmp"
];

nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ ncurses ];

propagatedBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3408,7 +3408,7 @@ in {
wtf-peewee = callPackage ../development/python-modules/wtf-peewee { };

graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix {
inherit (pkgs) pkgconfig;
inherit (pkgs) pkg-config;
};

grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };