Merge pull request #110824 from SuperSandro2000/fix-collection5

10 files changed, 22 insertions, 30 deletions

diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index f2510d6f6bbe..3fb3fc305a33 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "http://named-data.net/";
+    homepage = "https://named-data.net/";
     description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
     longDescription = ''
       ndn-cxx is a C++ library, implementing Named Data Networking (NDN)
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 52a49d6fbee9..177cef6c59f9 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -64655,7 +64655,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "The browser package manager";
-      homepage = http://bower.io/;
+      homepage = https://bower.io/;
       license = "MIT";
     };
     production = true;
@@ -81529,7 +81529,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
-      homepage = http://github.com/remy/inliner;
+      homepage = https://github.com/remy/inliner;
       license = "MIT";
     };
     production = true;
@@ -83404,7 +83404,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
-      homepage = http://jshint.com/;
+      homepage = https://jshint.com/;
       license = "MIT";
     };
     production = true;
@@ -91362,7 +91362,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Low-code programming for event-driven applications";
-      homepage = http://nodered.org/;
+      homepage = https://nodered.org/;
       license = "Apache-2.0";
     };
     production = true;
@@ -95346,7 +95346,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Production process manager for Node.JS applications with a built-in load balancer.";
-      homepage = http://pm2.keymetrics.io/;
+      homepage = https://pm2.keymetrics.io/;
       license = "AGPL-3.0";
     };
     production = true;
@@ -110719,7 +110719,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "CLI tool for running Yeoman generators";
-      homepage = http://yeoman.io/;
+      homepage = https://yeoman.io/;
       license = "BSD-2-Clause";
     };
     production = true;
diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix
index 821561c05554..0e8732f69a8f 100644
--- a/pkgs/development/python-modules/capturer/default.nix
+++ b/pkgs/development/python-modules/capturer/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytest, pytestcov }:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }:
 
 buildPythonPackage rec {
   pname = "capturer";
@@ -13,10 +13,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ humanfriendly ];
 
-  checkPhase = ''
-    PATH=$PATH:$out/bin pytest .
-  '';
-  checkInputs = [ pytest ];
+  # hangs on darwin
+  doCheck = !stdenv.isDarwin;
+  checkInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Easily capture stdout/stderr of the current process and subprocesses";
diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix
index 48d13ab49dd2..caa783bb8238 100644
--- a/pkgs/development/python-modules/coloredlogs/default.nix
+++ b/pkgs/development/python-modules/coloredlogs/default.nix
@@ -8,7 +8,6 @@
 , pytest
 , mock
 , util-linux
-, isPy38
 }:
 
 buildPythonPackage rec {
@@ -24,7 +23,7 @@ buildPythonPackage rec {
 
   # capturer is broken on darwin / py38, so we skip the test until a fix for
   # https://github.com/xolox/python-capturer/issues/10 is released.
-  doCheck = !(isPy38 && stdenv.isDarwin);
+  doCheck = !stdenv.isDarwin;
   checkPhase = ''
     PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
                                      and not test_auto_install"
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index d826fc33324f..263bdfa2f478 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -12,13 +12,6 @@ buildPythonPackage rec {
     sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \
-      --replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2"
-  '';
-  # cloudpickle range has been expanded in package but not yet released
-
   propagatedBuildInputs = [
     numpy requests six pyglet scipy cloudpickle
   ];
diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix
index 3569f6239f0f..42de3d2da9a8 100644
--- a/pkgs/development/python-modules/mpmath/default.nix
+++ b/pkgs/development/python-modules/mpmath/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage    = "http://mpmath.org/";
+    homepage    = "https://mpmath.org/";
     description = "A pure-Python library for multiprecision floating arithmetic";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix
index b1d5f4efb090..bb15a4d927ab 100644
--- a/pkgs/development/python-modules/pyres/default.nix
+++ b/pkgs/development/python-modules/pyres/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
+{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
 
 let
 
@@ -31,6 +31,9 @@ buildPythonPackage rec {
     sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y";
   };
 
+  # started redis-server makes this hang on darwin
+  doCheck = !stdenv.isDarwin;
+
   checkPhase = ''
     redis-server &
     nosetests . --exclude test_worker_pids
diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix
index a7c0fa3ff4a4..3949361a0a8c 100644
--- a/pkgs/development/python-modules/qimage2ndarray/default.nix
+++ b/pkgs/development/python-modules/qimage2ndarray/default.nix
@@ -1,7 +1,6 @@
 { lib, pkgs, buildPythonPackage, fetchPypi, isPy3k
 , numpy
 , pyqt5
-, nose
 }:
 
 buildPythonPackage rec {
@@ -14,15 +13,14 @@ buildPythonPackage rec {
     sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365";
   };
 
-  checkInputs = [
-    nose
-  ];
-
   propagatedBuildInputs = [
     numpy
     pyqt5
   ];
 
+  # no tests executed
+  doCheck = false;
+
   meta = {
     homepage = "https://github.com/hmeine/qimage2ndarray";
     description = "A small python extension for quickly converting between QImages and numpy.ndarrays (in both directions)";
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index ceb57e86afb3..7dcc56d9f6e8 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A full-featured console (xterm et al.) user interface library";
-    homepage = "http://excess.org/urwid";
+    homepage = "https://excess.org/urwid";
     repositories.git = "git://github.com/wardi/urwid.git";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 4964056055e7..e8da4a596579 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -3871,7 +3871,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Static analysis tool for JavaScript";
-      homepage = "http://jshint.com/";
+      homepage = "https://jshint.com/";
       license = "(MIT AND JSON)";
     };
     production = true;