Merge master into staging-next

2021-02-26 10:25:13 +01:00
parent babf9d6100 6d7128414c
commit c456a2512f
579 changed files with 9802 additions and 3062 deletions
--- a/pkgs/development/python-modules/adblock/default.nix
+++ b/pkgs/development/python-modules/adblock/default.nix
@@ -46,11 +46,10 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "adblock" ];

-  passthru.meta = with lib; {
+  meta = with lib; {
    description = "Python wrapper for Brave's adblocking library, which is written in Rust";
    homepage = "https://github.com/ArniDagur/python-adblock/";
    maintainers = with maintainers; [ petabyteboy ];
    license = with licenses; [ asl20 mit ];
-    platforms = with platforms; [ all ];
  };
 }