From 5f948152e58aced7513f03f9279e9a002b16579c Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 31 Dec 2020 11:55:41 +1000 Subject: [PATCH] NixOS 20.03 migration changes --- hosts/dionach.nix | 4 ++-- hosts/paidh-tri.nix | 4 ++-- nix/sources.json | 26 +++++++++++++------------- roles/coturn.nix | 1 - roles/crystal0.32.nix | 12 ------------ roles/cyclone-ibis.nix | 2 ++ roles/desktop_common.nix | 3 +-- roles/iohk.nix | 4 ---- roles/matrix.nix | 7 ++----- roles/mcwhirter.io.nix | 1 - roles/nextcloud.nix | 3 +-- 11 files changed, 23 insertions(+), 44 deletions(-) delete mode 100644 roles/crystal0.32.nix diff --git a/hosts/dionach.nix b/hosts/dionach.nix index db50edd..0c26c97 100644 --- a/hosts/dionach.nix +++ b/hosts/dionach.nix @@ -65,7 +65,8 @@ ddrescue docutils # Python Documentation Utilities electrum # Bitcoin wallet - emacs25-nox # Emacs, no X11 + element-desktop # A feature-rich client for Matrix.org + emacs26-nox # Emacs, no X11 evince exiftool # A tool to read, write and edit EXIF meta information fd # A simple, fast and user-friendly alternative to find @@ -111,7 +112,6 @@ python37Packages.sphinx # A tool that makes it easy to create intelligent and beautifulul documentation for Python projects radiotray-ng # Internet radio player rdiff-backup # External backups - riot-desktop # A feature-rich client for Matrix.org shared_mime_info shotwell signal-desktop diff --git a/hosts/paidh-tri.nix b/hosts/paidh-tri.nix index ec2055e..51aa83f 100644 --- a/hosts/paidh-tri.nix +++ b/hosts/paidh-tri.nix @@ -8,7 +8,7 @@ ]; # Comment out deployment when building the SD Image. - deployment.targetHost = "10.69.0.203"; + deployment.targetHost = "10.42.0.203"; networking.hostName = "paidh-tri"; # Define your hostname. environment.systemPackages = with pkgs; [ @@ -17,5 +17,5 @@ nixops # NixOS cloud provisioning and deployment tool ]; - system.stateVersion = "19.09"; # The version of NixOS originally installed + system.stateVersion = "20.09"; # The version of NixOS originally installed } diff --git a/nix/sources.json b/nix/sources.json index 93a2858..84104d8 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,26 +1,26 @@ { "cardano-node": { - "branch": "refs/tags/1.21.2", + "branch": "refs/tags/1.23.0", "description": "The core component that is used to participate in a Cardano decentralised blockchain.", "homepage": "https://cardano.org", "owner": "input-output-hk", "repo": "cardano-node", - "rev": "9577e0a514454fd59faeba79a1bb6d670eddb96d", - "sha256": "0iby57rgwvhshnxlv3skrfaml5fgqmxhamjk70s69sifn6pih6sy", + "rev": "eed250546fa9acec4c9de557b3e3551c1f682a30", + "sha256": "0n74w8s6py7v59dl09a3khlk2b4h2k6cnh6p916gv35bx5p712bz", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/9577e0a514454fd59faeba79a1bb6d670eddb96d.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/eed250546fa9acec4c9de557b3e3551c1f682a30.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "daedalus": { - "branch": "release/2.3.0", + "branch": "release/2.4.1", "description": "The open source cryptocurrency wallet for ada, built to grow with the community", "homepage": "https://daedaluswallet.io/", "owner": "input-output-hk", "repo": "daedalus", - "rev": "b0ddd082319aa456cdb61561703b0fa5358617b6", - "sha256": "0k8mq2b4s1p8kj7qvrhmbav4ngp3xrka16667vyj83jwsyrxcmgi", + "rev": "aa9c7ce19ffe065ec80849b6886161d8dda112ed", + "sha256": "01dps5l59lxk9pcrngjrfhsk1lxh20zcg9sj269qp463bv8ljlq4", "type": "tarball", - "url": "https://github.com/input-output-hk/daedalus/archive/b0ddd082319aa456cdb61561703b0fa5358617b6.tar.gz", + "url": "https://github.com/input-output-hk/daedalus/archive/aa9c7ce19ffe065ec80849b6886161d8dda112ed.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -36,16 +36,16 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-20.03", + "branch": "nixos-20.09", "builtin": false, "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", - "repo": "nixpkgs-channels", - "rev": "0d0660fde3bb53a3d013b65e5e141eb11d1efb82", - "sha256": "13qpa916qq1kqvfj8q4zkmnfnbh2kpx0nxxg04nblai0smz97820", + "repo": "nixpkgs", + "rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb", + "sha256": "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs-channels/archive/0d0660fde3bb53a3d013b65e5e141eb11d1efb82.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/58f9c4c7d3a42c912362ca68577162e38ea8edfb.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/roles/coturn.nix b/roles/coturn.nix index b67f809..0b1b687 100644 --- a/roles/coturn.nix +++ b/roles/coturn.nix @@ -45,7 +45,6 @@ security.acme.certs = { "turn.mcwhirter.io" = { group = "turnserver"; - allowKeysForGroup = true; postRun = "systemctl reload nginx.service"; email = "acme@mcwhirter.io"; }; diff --git a/roles/crystal0.32.nix b/roles/crystal0.32.nix deleted file mode 100644 index 5b5c1cd..0000000 --- a/roles/crystal0.32.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This role utilizes a local version of nixpkgs that bumps Crystal from 0.30.1 -# to 0.32.1 - -{ config, pkgs, lib, ... }: - -{ - - environment.systemPackages = [ (import /home/craige/source/NixOS/nixpkgs {}).crystal ]; - -} - - diff --git a/roles/cyclone-ibis.nix b/roles/cyclone-ibis.nix index ad3ebab..a06ebed 100644 --- a/roles/cyclone-ibis.nix +++ b/roles/cyclone-ibis.nix @@ -17,6 +17,8 @@ in { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; }; + nixpkgs.config.allowBroken = true; # Hakyll is marked as broken in 20.09 + services.nginx = { enable = true; # Enable Nginx recommendedGzipSettings = true; diff --git a/roles/desktop_common.nix b/roles/desktop_common.nix index 6b11554..cba5c63 100644 --- a/roles/desktop_common.nix +++ b/roles/desktop_common.nix @@ -22,6 +22,7 @@ brave # Privacy-oriented browser google-chrome # A freeware web browser developed by Google chromium + element-desktop # A feature-rich client for Matrix.org firefoxWrapper # install Firefox with support for plugins gnome3.gnome-tweaks # A tool to customize advanced GNOME 3 options libreoffice-fresh @@ -30,7 +31,6 @@ usbutils # Tools for working with USB devices, such as lsusb user-manager nextcloud-client # Nextcloud desktop client - riot-desktop # A feature-rich client for Matrix.org xorg.libxcb # X C binding ]; @@ -88,7 +88,6 @@ nixpkgs.config = { allowUnfree = true; firefox = { - enableGoogleTalkPlugin = true; # Required for Google Meet enableAdobeFlash = false; # Disabled because Adobe Flash is just rubbish }; chromium = { diff --git a/roles/iohk.nix b/roles/iohk.nix index a57c47e..06b880b 100644 --- a/roles/iohk.nix +++ b/roles/iohk.nix @@ -31,19 +31,15 @@ systemPackages = with pkgs; [ awscli # Unified tool to manage your AWS services buildkite-agent # Buildkite for IOHK - #crystal # A compiled language with Ruby like syntax and type inference docker # Pack, ship and run any application as a lightweight container docker-compose # Multi-container orchestration for Docker freerdp # A Remote Desktop Protocol Client, xfreerdp gist # Upload code to https://gist.github.com (or github enterprise) gnupg # GNU Privacy Guard, a GPL OpenPGP implementation go-jira # Simple command line client for Atlassian's Jira service written in Go - #icr # Interactive console for the Crystal programming languag jq # A lightweight and flexible command-line JSON processor keybase-gui # The Keybase official client s3fs # Mount an S3 bucket as filesystem through FUSE - scry # Code analysis server for the Crystal programming language - shards # Dependency manager for the Crystal language slack-dark # Slack desktop client magic-wormhole # Securely transfer data between computers ]; diff --git a/roles/matrix.nix b/roles/matrix.nix index 7829d93..f3806f0 100644 --- a/roles/matrix.nix +++ b/roles/matrix.nix @@ -21,7 +21,6 @@ enable = true; # Enable the synapse server server_name = "mcwhirter.io"; # Server's public domain name public_baseurl = "https://synapse.mcwhirter.io:443/"; # Matrix target URL - web_client = true; # Whether to serve a web client enable_registration = true; # Toggle user registration listeners = [ { # federation @@ -96,7 +95,7 @@ "m.homeserver" = { "base_url" = "https://synapse.mcwhirter.io"; }; "m.identity_server" = { "base_url" = "https://vector.im"; }; }; - # ACAO required to allow riot-web on any URL to request this json file + # ACAO required to allow element-web on any URL to request this json file in '' add_header Content-Type application/json; add_header Access-Control-Allow-Origin *; @@ -113,7 +112,7 @@ serverAliases = [ "chat.${config.networking.domain}" ]; - root = pkgs.riot-web; # Install RIOT web in the nginx root + root = pkgs.element-web; # Install RIOT web in the nginx root }; }; }; @@ -146,13 +145,11 @@ certs = { "chat.mcwhirter.io" = { group = "matrix-synapse"; - allowKeysForGroup = true; postRun = "systemctl reload nginx.service"; email = "acme@mcwhirter.io"; }; "synapse.mcwhirter.io" = { group = "matrix-synapse"; - allowKeysForGroup = true; postRun = "systemctl reload nginx.service; systemctl restart matrix-synapse.service"; email = "acme@mcwhirter.io"; }; diff --git a/roles/mcwhirter.io.nix b/roles/mcwhirter.io.nix index 663b17e..30906f6 100644 --- a/roles/mcwhirter.io.nix +++ b/roles/mcwhirter.io.nix @@ -43,7 +43,6 @@ in { "${webdomain}" = { email = "admin@${webdomain}"; group = "matrix-synapse"; - allowKeysForGroup = true; }; #"www.${webdomain}" = { # email = "admin@${webdomain}"; diff --git a/roles/nextcloud.nix b/roles/nextcloud.nix index 6b871e7..567f745 100644 --- a/roles/nextcloud.nix +++ b/roles/nextcloud.nix @@ -12,7 +12,6 @@ services.nextcloud = { enable = true; # Enable Nextcloud hostName = "cloud.mcwhirter.io"; # FQDN for the Nextcloud instance - nginx.enable = true; # Whether to enable nginx virtual host management https = true; # Use HTTPS for links config = { # Configure Nextcloud dbtype = "pgsql"; # Set the database type @@ -28,7 +27,7 @@ enable = true; # Run regular auto update of all apps installed startAt = "01:00:00"; # When to run the update }; - package = pkgs.nextcloud18; + package = pkgs.nextcloud20; }; services.postgresql = {