public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* keepnote: depend on pythonPackages.sqlite3 rather than pythonFull.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26582
This commit is contained in:
Eelco Dolstra 2011-03-28 16:48:31 +00:00
parent 0a7b7374ac
commit 7b3bda471d
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/office/keepnote/default.nix
View File

@ -1,14 +1,15 @@
{stdenv, fetchurl, buildPythonPackage, pygtk}: { stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }:
buildPythonPackage { buildPythonPackage {
name = "keepnote-0.6.5"; name = "keepnote-0.6.5";
namePrefix = "";
src = fetchurl { src = fetchurl {
url = http://rasm.ods.org/keepnote/download/keepnote-0.6.5.tar.gz; url = http://rasm.ods.org/keepnote/download/keepnote-0.6.5.tar.gz;
sha256 = "0kipcy90r50z4m9p8pyy9wi4dknsiwdrgy974xgakris2rh4lafw"; sha256 = "0kipcy90r50z4m9p8pyy9wi4dknsiwdrgy974xgakris2rh4lafw";
}; };
propagatedBuildInputs = [ pygtk ]; propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ];
# Testing fails. # Testing fails.
doCheck = false; doCheck = false;

12
pkgs/top-level/all-packages.nix
View File

@ -6132,18 +6132,6 @@ let
kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { }; kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
keepnote = callPackage ../applications/office/keepnote { keepnote = callPackage ../applications/office/keepnote {
# I did not find any better way of reusing buildPythonPackage+setuptools
# for a python with openssl support
buildPythonPackage = assert pythonFull.sqliteSupport;
import ../development/python-modules/generic {
inherit makeWrapper lib;
python = pythonFull;
setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
inherit makeWrapper;
python = pythonFull;
};
};
# How could this pygtk use also pythonFull, I don't know.
pygtk = pyGtkGlade; pygtk = pyGtkGlade;
}; };