Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-02-07 13:52:42 +01:00
514 changed files with 24027 additions and 15228 deletions

View File

@@ -1,9 +1,9 @@
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4,
pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper,
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
gobjectIntrospection, pygobject3, gtk3, matplotlib }:
stdenv.mkDerivation rec {
version = "2.2.42";
version = "2.12";
name = "${python.libPrefix}-graph-tool-${version}";
meta = with stdenv.lib; {
@@ -15,15 +15,16 @@ stdenv.mkDerivation rec {
};
src = fetchurl {
url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9";
url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz";
sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl";
};
preConfigure = ''
configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp"
'';
configureFlags = [
"--with-python-module-path=$(out)/${python.sitePackages}"
"--enable-openmp"
];
buildInputs = [ automake m4 pkgconfig makeWrapper ];
buildInputs = [ pkgconfig autoreconfHook ];
propagatedBuildInputs = [
boost

View File

@@ -1,31 +1,26 @@
a @ { python, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, ... } :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }:
stdenv.mkDerivation rec {
name = "python-libsexy-${version}";
version = "0.1.9";
version = a.lib.attrByPath ["version"] "0.1.9" a;
buildInputs = with a; [
pkgconfig pygtk
];
propagatedBuildInputs = with a; [
libsexy python gtk glib pango libxml2
];
in
rec {
src = fetchurl {
url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";
sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
};
inherit buildInputs propagatedBuildInputs;
configureFlags = [];
buildInputs = [
pkgconfig pygtk
];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
postInstall = a.fullDepEntry (''
propagatedBuildInputs = [
libsexy gtk glib pango libxml2
];
postInstall = ''
ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
'') ["minInit"];
'';
name = "python-libsexy-" + version;
meta = {
description = "Python libsexy bindings";
};