Merge master into staging-next

2020-05-05 19:51:09 +02:00
parent 320f79365d 73dc3fc400
commit 9875bbae75
372 changed files with 3551 additions and 1619 deletions
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -75,7 +75,7 @@ in
      };

      link = mkOption {
-        default = "http://planet.nixos.org";
+        default = "https://planet.nixos.org";
        type = types.str;
        description = ''
          Link to the main page.