Merge branch 'master' into staging-next

2021-01-10 23:24:33 +01:00
parent 76394e4624 581232454f
commit dd72357155
298 changed files with 746 additions and 415 deletions
@@ -265,7 +265,7 @@ in
          meta = {
            description = "PageSpeed module for Nginx";
            homepage    = "https://developers.google.com/speed/pagespeed/module/";
-            license     = pkgs.stdenv.lib.licenses.asl20;
+            license     = pkgs.lib.licenses.asl20;
          };
        }
        ''