Merge branch 'nixos-21.11' into consensus

nix/sources.json

@@ -36,10 +36,12 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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/<rev>.tar.gz"
     },
     "niv": {
         "branch": "master",
@@ -54,16 +56,16 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.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/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgsUnstable": {

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;
+}

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";
 

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 = {

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
   ];
 }