alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

zeitgeist: switch to Python 3

Browse source
This commit is contained in:
WORLDofPEACE 2020-10-04 01:45:24 -04:00 committed by Jan Tojnar
parent 4d61e42de4
commit 9aaad83e43
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/zeitgeist/default.nix
View file

@ -15,7 +15,7 @@
, json-glib , json-glib
, librdf_raptor2 , librdf_raptor2
, pythonSupport ? true , pythonSupport ? true
, python2Packages , python3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
gettext gettext
gobject-introspection gobject-introspection
vala vala
python2Packages.python python3
]; ];
buildInputs = [ buildInputs = [
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
json-glib json-glib
librdf_raptor2 librdf_raptor2
python2Packages.rdflib python3.pkgs.rdflib
]; ];
configureFlags = [ configureFlags = [
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
''; '';
postFixup = stdenv.lib.optionalString pythonSupport '' postFixup = stdenv.lib.optionalString pythonSupport ''
moveToOutput lib/${python2Packages.python.libPrefix} "$py" moveToOutput lib/${python3.libPrefix} "$py"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/top-level/python-packages.nix
View file

@ -7778,7 +7778,7 @@ in {
zeep = callPackage ../development/python-modules/zeep { }; zeep = callPackage ../development/python-modules/zeep { };
zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py; zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py;
zerobin = callPackage ../development/python-modules/zerobin { }; zerobin = callPackage ../development/python-modules/zerobin { };