diff options
-rw-r--r-- | pkgs/applications/science/biology/xenomapper/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python2-packages.nix | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/applications/science/biology/xenomapper/default.nix index f5e538c70961e..194db966915e1 100644 --- a/pkgs/applications/science/biology/xenomapper/default.nix +++ b/pkgs/applications/science/biology/xenomapper/default.nix @@ -1,6 +1,6 @@ -{buildPythonPackage, lib, fetchFromGitHub, statistics}: +{ python3, lib, fetchFromGitHub }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "xenomapper"; version = "1.0.2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0mnmfzlq5mhih6z8dq5bkx95vb8whjycz9mdlqwbmlqjb3gb3zhr"; }; - propagatedBuildInputs = [ statistics ]; + propagatedBuildInputs = with python3.pkgs; [ statistics ]; meta = with lib; { homepage = "https://github.com/genomematt/xenomapper"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55d2d45ff437b..d5ddc7a8e8902 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31636,6 +31636,8 @@ with pkgs; whisper = callPackage ../applications/science/biology/whisper { }; + xenomapper = callPackage ../applications/science/biology/xenomapper { }; + hmmer = callPackage ../applications/science/biology/hmmer { }; bwa = callPackage ../applications/science/biology/bwa { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3438d68a2b1f5..f131cfcb06eea 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -106,6 +106,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 websocket_client = websocket-client; # added 2021-06-15 + xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fbcb8f33be74c..69b57adc3b6bb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10379,8 +10379,6 @@ in { inherit (pkgs) graphviz; }; - xenomapper = callPackage ../applications/science/biology/xenomapper { }; - xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 2b5b9075ab666..77a234b4e1d45 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -661,8 +661,6 @@ with self; with super; { xcaplib = callPackage ../development/python-modules/xcaplib { }; - xenomapper = disabled super.xenomapper; - yenc = callPackage ../development/python-modules/yenc { }; yt = callPackage ../development/python-modules/yt { }; |