BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7872 from matthiasbeyer/fix-khal_python

Browse source 
Fix: khal 0.4.0 does not work with python 3
This commit is contained in:
Jascha Geerds 2015-06-16 15:06:42 +02:00
commit 07cdc40222
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/khal/default.nix
View file

@ -22,13 +22,13 @@ pythonPackages.buildPythonPackage rec {
requests_toolbelt requests_toolbelt
tzlocal tzlocal
urwid urwid
python.modules.sqlite3
]; ];
meta = { meta = with stdenv.lib; {
homepage = http://lostpackets.de/khal/; homepage = http://lostpackets.de/khal/;
description = "CLI calendar application"; description = "CLI calendar application";
license = stdenv.lib.licenses.mit; license = licenses.mit;
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; maintainers = with maintainers; [ matthiasbeyer jgeerds ];
}; };
} }

14
pkgs/tools/misc/vdirsyncer/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchurl, pythonPackages }: { stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
version = "0.4.3"; version = "0.4.3";
@ -10,10 +10,9 @@ pythonPackages.buildPythonPackage rec {
sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai"; sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai";
}; };
pythonPath = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
icalendar icalendar
click click
requests
lxml lxml
setuptools setuptools
requests_toolbelt requests_toolbelt
@ -21,12 +20,11 @@ pythonPackages.buildPythonPackage rec {
atomicwrites atomicwrites
]; ];
meta = { meta = with stdenv.lib; {
homepage = https://github.com/untitaker/vdirsyncer; homepage = https://github.com/untitaker/vdirsyncer;
description = "Synchronize calendars and contacts"; description = "Synchronize calendars and contacts";
maintainers = [ lib.maintainers.matthiasbeyer ]; maintainers = with maintainers; [ matthiasbeyer jgeerds ];
platforms = lib.platforms.all; platforms = platforms.all;
license = lib.licenses.mit; license = licenses.mit;
}; };
} }

8
pkgs/top-level/all-packages.nix
View file

@ -11615,9 +11615,7 @@ let
keymon = callPackage ../applications/video/key-mon { }; keymon = callPackage ../applications/video/key-mon { };
khal = callPackage ../applications/misc/khal { khal = callPackage ../applications/misc/khal { };
pythonPackages = python3Packages;
};
kid3 = callPackage ../applications/audio/kid3 { kid3 = callPackage ../applications/audio/kid3 {
qt = qt4; qt = qt4;
@ -12689,9 +12687,7 @@ let
vcprompt = callPackage ../applications/version-management/vcprompt { }; vcprompt = callPackage ../applications/version-management/vcprompt { };
vdirsyncer = callPackage ../tools/misc/vdirsyncer { vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
pythonPackages = python3Packages;
};
vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { };