Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts:
- pkgs/development/python-modules/langsmith/default.nix
- pkgs/development/python-modules/rich-pixels/default.nix
- pkgs/servers/teleport/generic.nix

1 files changed, 0 insertions, 23 deletions

diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix
deleted file mode 100644
index 27a1b7ed38416..0000000000000
--- a/pkgs/applications/science/biology/poretools/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, python2Packages, fetchFromGitHub }:
-
-python2Packages.buildPythonPackage rec {
-  pname = "poretools";
-  version = "unstable-2016-07-10";
-
-  src = fetchFromGitHub {
-    repo = pname;
-    owner = "arq5x";
-    rev = "e426b1f09e86ac259a00c261c79df91510777407";
-    sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am";
-  };
-
-  propagatedBuildInputs = [ python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas ];
-
-  meta = {
-    description = "Toolkit for working with nanopore sequencing data from Oxford Nanopore";
-    license = lib.licenses.mit;
-    homepage = "https://poretools.readthedocs.io/en/latest/";
-    maintainers = [ lib.maintainers.rybern ];
-    broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7
-  };
-}