Merge branch 'staging-next' into staging

2020-08-23 02:18:27 +02:00
parent 728f8e21d4 91104b5417
commit 58377555ed
516 changed files with 15983 additions and 9551 deletions
--- a/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -1,10 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi
-, frozendict, simplejson, six
+, frozendict, simplejson, six, isPy27
 }:

 buildPythonPackage rec {
  pname = "canonicaljson";
  version = "1.3.0";
+  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;