Merge branch 'master' into staging-next

A few more rebuilds (~1k on x86_64-linux).
2019-01-05 15:02:04 +01:00
parent d9707792b5 17f4d415a2
commit d84a33d85b
27 changed files with 142 additions and 83 deletions
@@ -93,6 +93,7 @@ in
        VERSION_CODENAME=${toLower cfg.codeName}
        VERSION_ID="${cfg.version}"
        PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
+        LOGO="nix-snowflake"
        HOME_URL="https://nixos.org/"
        SUPPORT_URL="https://nixos.org/nixos/support.html"
        BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"