diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-09-22 08:44:04 +0100 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-09-22 10:48:21 +0100 |
| commit | 446f9c96f548cab37984aa6cd510ae7e16c3791d (patch) | |
| tree | f0551b4aaacef9bab66c8df7e5a6a60f8edfe2c6 | |
| parent | be530263bc0bb2888ccec4d3194832076420392d (diff) | |
| download | nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.tar nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.tar.gz nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.tar.bz2 nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.tar.lz nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.tar.xz nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.tar.zst nixlib-446f9c96f548cab37984aa6cd510ae7e16c3791d.zip | |
topydo: really move out of python-packages
| -rw-r--r-- | pkgs/applications/misc/topydo/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index f115c7b22f01..34952b9c0f4d 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -1,11 +1,11 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, arrow, icalendar, mock, freezegun -, coverage, glibcLocales, isPy3k, green, pylint, prompt_toolkit, urwid, watchdog }: +{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }: -buildPythonPackage rec { +with python3Packages; + +buildPythonApplication rec { pname = "topydo"; version = "0.13"; name = "${pname}-${version}"; - disabled = (!isPy3k); src = fetchFromGitHub { owner = "bram85"; @@ -22,6 +22,7 @@ buildPythonPackage rec { urwid watchdog ]; + checkInputs = [ mock freezegun coverage green pylint ]; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e326c8be1a1..2a4f43a4353b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16522,7 +16522,7 @@ with pkgs; quazip = quazip_qt4; }; - topydo = (newScope python3Packages) ../applications/misc/topydo {}; + topydo = callPackage ../applications/misc/topydo {}; torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch { lua = luajit ; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13df3a6fc0ba..aa432650c3d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25804,7 +25804,7 @@ EOF }; }; - topydo = callPackage ../development/python-modules/topydo {}; + topydo = builtins.trace "python3Packages.topydo was moved to topydo" pkgs.topydo; # 2017-09-22 w3lib = buildPythonPackage rec { name = "w3lib-${version}"; |