From bc442a7d4c8d01adc4ffdd3159f919dca9270249 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Tue, 21 Dec 2021 23:49:11 +1000 Subject: [PATCH 1/6] nix: bumped to HEAD of 21.11 --- nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 1e5f7ac..871c354 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -54,16 +54,16 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-21.05", + "branch": "nixos-21.11", "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", - "rev": "2949ed36539dcc6cd08e95b25d42e19ffab3d027", - "sha256": "1xg8wnqgmcb8gc58j09h4qjhqf21q21nkh3c8kkz9d7spbn12a9l", + "rev": "86453059bf8312f0f5bf1fe8a2f52da2be664489", + "sha256": "0inzy97dp5988cwjwpn41219rir4c7qp7wwg7v4abcs9lypg8is4", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/2949ed36539dcc6cd08e95b25d42e19ffab3d027.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/86453059bf8312f0f5bf1fe8a2f52da2be664489.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgsUnstable": { From cc826d59f7d80b53e76278cdcf0c5037a0493790 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Tue, 21 Dec 2021 23:52:33 +1000 Subject: [PATCH 2/6] nixops: added storage.legacy --- nixops.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 nixops.nix diff --git a/nixops.nix b/nixops.nix new file mode 100644 index 0000000..28e5dcf --- /dev/null +++ b/nixops.nix @@ -0,0 +1,30 @@ +# NixOps configuration for the mio-ops nodes + +{ + network = { + description = "mio-ops nodes"; + enableRollback = true; + }; + + network.storage.legacy = { databasefile = "~/.nixops/deployments.nixops"; }; + + defaults = { config, pkgs, lib, ... }: + + { + system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps + }; + + airgead = import hosts/airgead.nix; + ceilidh = import hosts/ceilidh.nix; + cuallaidh = import hosts/cuallaidh.nix; + dhu = import hosts/dhu.nix; + dionach = import hosts/dionach.nix; + iolear-beag = import hosts/iolear-beag.nix; + paidh-ceithir = import hosts/paidh-ceithir.nix; + paidh-coig = import hosts/paidh-coig.nix; + paidh-dha = import hosts/paidh-dha.nix; + paidh-tri = import hosts/paidh-tri.nix; + paidh-uachdar = import hosts/paidh-uachdar.nix; + sithlainnir = import hosts/sithlainnir.nix; + teintidh = import hosts/teintidh.nix; +} From ea00c6f31f704cd1ce70916998500cc626792499 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 22 Dec 2021 20:21:50 +1000 Subject: [PATCH 3/6] mcwhirter.io: bumped to head of 21.11 --- nix/sources.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 871c354..72637c7 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -36,10 +36,12 @@ "url_template": "https://github.com///archive/.tar.gz" }, "mcwhirter-io": { - "sha256": "1mng09gf9h25w6xnjrabq9zqi28w71ili0haqjqfhbyf3cg54zyy", + "branch": "consensus", + "rev": "a53a2f8a8a23eb0579ba6d0ec1c6e749bfcf8467", + "sha256": "1b72841hbj6wqsb37ma4y148lx287qjmcbr9p1dbzras6k4xvdlz", "type": "tarball", - "url": "https://source.mcwhirter.io/craige/mcwhirter.io/archive/consensus.tar.gz", - "url_template": "https://source.mcwhirter.io/craige/mcwhirter.io/archive/consensus.tar.gz" + "url": "https://source.mcwhirter.io/craige/mcwhirter.io/archive/a53a2f8a8a23eb0579ba6d0ec1c6e749bfcf8467.tar.gz", + "url_template": "https://source.mcwhirter.io/craige/mcwhirter.io/archive/.tar.gz" }, "niv": { "branch": "master", From 52867ed64f2ea4a2135e56664097173f15ad497b Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 22 Dec 2021 20:48:50 +1000 Subject: [PATCH 4/6] cyclone-ibis: bumped to head of 21.11 --- profiles/cyclone-ibis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/cyclone-ibis.nix b/profiles/cyclone-ibis.nix index 4d2c000..dab6843 100644 --- a/profiles/cyclone-ibis.nix +++ b/profiles/cyclone-ibis.nix @@ -7,7 +7,7 @@ let name = "cyclone-ibis-src"; url = "https://source.mcwhirter.io/craige/cyclone-ibis.git"; branchName = "consensus"; - sha256 = "sha256-EmPwVuyOHVFtE9Od8elgjXBAs/Pu76sYmChRsuZKo0I="; + sha256 = "sha256-NIEs0EuiHL9Zll0Sa4aR5zyzerw5akXxSC1pkDQPG5s="; }) { nixpkgs = pkgs; }; webdomain = "cycloneibis.com"; From 263562bffedd005f033dc776978ff0c9b993c1a0 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Wed, 22 Dec 2021 20:56:53 +1000 Subject: [PATCH 5/6] nextcloud: bumped to v23.0.0 --- profiles/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/nextcloud.nix b/profiles/nextcloud.nix index a3cc544..6fcc7a6 100644 --- a/profiles/nextcloud.nix +++ b/profiles/nextcloud.nix @@ -28,7 +28,7 @@ enable = true; # Run regular auto update of all apps installed startAt = "01:00:00"; # When to run the update }; - package = pkgs.nextcloud22; + package = pkgs.nextcloud23; }; services.postgresql = { From 266743a3b251dfc9a1b4e24827e16895d60fe74e Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Thu, 23 Dec 2021 11:02:13 +1000 Subject: [PATCH 6/6] wine: removed deprecated override --- profiles/wine.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/profiles/wine.nix b/profiles/wine.nix index 5727b0f..9264954 100644 --- a/profiles/wine.nix +++ b/profiles/wine.nix @@ -14,9 +14,8 @@ (wine.override { wineBuild = "wine64"; }) # wine-staging (version with experimental features) - #wineWowPackages.staging + wineWowPackages.staging - # winetricks and other programs depending on wine need to use the same wine version - (winetricks.override { wine = wineWowPackages.staging; }) + winetricks ]; }