diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 85720f644831..7f7f1308eb13 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -22,13 +22,13 @@ pythonPackages.buildPythonPackage rec { requests_toolbelt tzlocal urwid + python.modules.sqlite3 ]; - meta = { + meta = with stdenv.lib; { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; }; } - diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 5312445563a6..86e424ad08be 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { version = "0.4.3"; @@ -10,10 +10,9 @@ pythonPackages.buildPythonPackage rec { sha256 = "0jrxmq8lq0dvqflmh42hhyvc3jjrg1cg3gzfhdcsskj9zz0m6wai"; }; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ icalendar click - requests lxml setuptools requests_toolbelt @@ -21,12 +20,11 @@ pythonPackages.buildPythonPackage rec { atomicwrites ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/untitaker/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = [ lib.maintainers.matthiasbeyer ]; - platforms = lib.platforms.all; - license = lib.licenses.mit; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + platforms = platforms.all; + license = licenses.mit; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77268cb088fd..2bba940c49a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11615,9 +11615,7 @@ let keymon = callPackage ../applications/video/key-mon { }; - khal = callPackage ../applications/misc/khal { - pythonPackages = python3Packages; - }; + khal = callPackage ../applications/misc/khal { }; kid3 = callPackage ../applications/audio/kid3 { qt = qt4; @@ -12689,9 +12687,7 @@ let vcprompt = callPackage ../applications/version-management/vcprompt { }; - vdirsyncer = callPackage ../tools/misc/vdirsyncer { - pythonPackages = python3Packages; - }; + vdirsyncer = callPackage ../tools/misc/vdirsyncer { }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { };