Merge branch 'master' into staging-next

pkgs/development/python-modules/asyncwhois/default.nix

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "0.2.3";
+  version = "0.2.4";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "95df90d5be581e3c69398abc6a3ec69a4e568852d9d6df4582bfcc0e22ffb3bb";
+    sha256 = "84677e90bc2d2975788e905ae9841bc91a732a452bc870991105b0a6cc3cd22f";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/fritzconnection/default.nix

@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "1.4.0";
+  version = "1.4.1";
 
   # no tests on PyPI
   src = fetchFromGitHub {
     owner = "kbr";
     repo = pname;
     rev = version;
-    sha256 = "1p8dqcc75xfhyvc9izjzz8c7qfrdkjkrkj36j7ms5fimn5bwk70q";
+    sha256 = "1v8gyr91ddinxgl7507hw64snsvcpm3r7bmdjw2v5v6rmc0wl06s";
   };
 
   disabled = pythonOlder "3.6";

pkgs/development/python-modules/immutables/default.nix

@@ -1,4 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "immutables";
@@ -10,10 +15,14 @@ buildPythonPackage rec {
     sha256 = "3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b";
   };
 
-  meta = {
+  checkInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "immutables" ];
+
+  meta = with lib; {
     description = "An immutable mapping type for Python";
     homepage = "https://github.com/MagicStack/immutables";
-    license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ catern ];
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ catern ];
   };
 }

pkgs/development/python-modules/myfitnesspal/default.nix

@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "myfitnesspal";
-  version = "1.16.1";
+  version = "1.16.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6";
+    sha256 = "44b31623fd71fedd891c3f66be3bc1caa6f1caf88076a75236ab74f8807f6ae5";
   };
 
   # Remove overly restrictive version constraints

pkgs/development/python-modules/ovito/default.nix

@@ -1,42 +0,0 @@
-{ lib, stdenv
-, fetchFromGitLab
-, cmake
-, ffmpeg
-, netcdf
-, qscintilla
-, zlib
-, boost
-, git
-, fftw
-, hdf5
-, libssh
-, qt5
-, python
-}:
-
-stdenv.mkDerivation rec {
-  version = "3.3.5";
-  pname = "ovito";
-
-  src = fetchFromGitLab {
-    owner = "stuko";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "2tptLK0RU0afSFFE7uzL8bZ5j+nyRyh97ujJAHFh0wQ=";
-  };
-
-  nativeBuildInputs = [ cmake git ];
-  buildInputs = [ ffmpeg netcdf qscintilla zlib boost zlib fftw hdf5 libssh qt5.qtbase qt5.qtsvg ];
-
-  propagatedBuildInputs = with python.pkgs; [ sphinx numpy sip pyqt5 matplotlib ase ];
-
-  meta = with lib; {
-    description = "Scientific visualization and analysis software for atomistic simulation data";
-    homepage = "https://www.ovito.org";
-    license = with licenses; [ gpl3Only mit ];
-    maintainers = with maintainers; [ costrouc ];
-    # ensures not built on hydra
-    # https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
-    hydraPlatforms = [ ];
-  };
-}