Merge staging-next into staging

2020-08-17 17:51:54 +02:00
parent 7894420373 0ac85bc455
commit 7dba683656
499 changed files with 2713 additions and 6206 deletions
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchPypi, buildPythonPackage, click, redis }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }:

 buildPythonPackage rec {
  pname = "rq";
  version = "1.5.0";
+  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;