diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 18:02:10 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 18:02:10 +0300 |
| commit | 09f02b918ec4df875326e3addcdb99343c976a78 (patch) | |
| tree | 168f27854f3f5adc6d1aaffa4adfac1b42c4ec8c /pkgs/development/python-modules | |
| parent | 48195dd2becfa820353e900ba05737b4fce1b466 (diff) | |
| parent | f9e5eccb13ffbbac3381cfa85ffd1748d3dacd77 (diff) | |
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/graph-tool/2.x.x.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyatspi/default.nix | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index be1592f864fa..4f39d1097b1c 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -3,7 +3,7 @@ pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { - version = "2.12"; + version = "2.16"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz"; - sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl"; + url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; + sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p"; }; configureFlags = [ diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 636126ea74ab..598056a0c361 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python3, python3Packages, at_spi2_core }: +{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }: stdenv.mkDerivation rec { version = "2.18.0"; @@ -9,8 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0imbyk2v6c11da7pkwz91313pkkldxs8zfg81zb2ql6h0nnh6vzq"; }; + broken = true; + buildInputs = [ - pkgconfig python3 python3Packages.pygobject3 at_spi2_core + at_spi2_core + pkgconfig + pythonPackages.python + pythonPackages.pygobject3 ]; meta = with stdenv.lib; { |