Author: eelco
Date: Mon Mar 28 16:48:31 2011
New Revision: 26582
URL: https://svn.nixos.org/websvn/nix/?rev=26582&sc=1
Log:
* keepnote: depend on pythonPackages.sqlite3 rather than pythonFull.
Modified:
nixpkgs/branches/modular-python/pkgs/applications/office/keepnote/default.nix
nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/modular-python/pkgs/applications/office/keepnote/default.nix
==============================================================================
---
nixpkgs/branches/modular-python/pkgs/applications/office/keepnote/default.nix
Mon Mar 28 16:48:02 2011 (r26581)
+++
nixpkgs/branches/modular-python/pkgs/applications/office/keepnote/default.nix
Mon Mar 28 16:48:31 2011 (r26582)
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, buildPythonPackage, pygtk}:
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }:
buildPythonPackage {
name = "keepnote-0.6.5";
+ namePrefix = "";
src = fetchurl {
url = http://rasm.ods.org/keepnote/download/keepnote-0.6.5.tar.gz;
sha256 = "0kipcy90r50z4m9p8pyy9wi4dknsiwdrgy974xgakris2rh4lafw";
};
- propagatedBuildInputs = [ pygtk ];
+ propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ];
# Testing fails.
doCheck = false;
Modified: nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Mon Mar
28 16:48:02 2011 (r26581)
+++ nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Mon Mar
28 16:48:31 2011 (r26582)
@@ -6132,18 +6132,6 @@
kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
