Merge master into staging-next

2020-11-06 12:51:56 +01:00
parent c7176d55ac da04a8e397
commit 99fb79ae84
115 changed files with 3226 additions and 2507 deletions
@@ -1379,6 +1379,8 @@ in {
  else
    callPackage ../development/python-modules/cryptography/vectors.nix { };

+  crytic-compile = callPackage ../development/python-modules/crytic-compile { };
+
  csscompressor = callPackage ../development/python-modules/csscompressor { };

  cssmin = callPackage ../development/python-modules/cssmin { };