From e2cce7daa8bea1671f95256dd1e2fbe17636332b Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sat, 8 Jul 2023 15:33:00 +0200
Subject: [PATCH] update to nixos 23.05

---
 .cirrus.yml                     |  2 +-
 examples/configuration.nix      |  4 ++--
 flake.lock                      |  8 ++++----
 flake.nix                       |  2 +-
 pkgs/pinned.nix                 | 10 +++++-----
 test/clightning-replication.nix |  2 +-
 test/lib/make-test.nix          |  2 +-
 test/tests.nix                  |  5 ++++-
 8 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index fbbf47e..918c891 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@ task:
 
   container:
     # Defined in https://github.com/nix-community/docker-nixpkgs
-    image: nixpkgs/nix-flakes:nixos-22.11
+    image: nixpkgs/nix-flakes:nixos-23.05
 
   matrix:
     - name: modules_test
diff --git a/examples/configuration.nix b/examples/configuration.nix
index 1f9651d..5db7bb9 100644
--- a/examples/configuration.nix
+++ b/examples/configuration.nix
@@ -265,7 +265,7 @@
 
   services.openssh = {
     enable = true;
-    passwordAuthentication = false;
+    settings.PasswordAuthentication = false;
   };
   users.users.root = {
     openssh.authorizedKeys.keys = [
@@ -292,7 +292,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.11"; # Did you read the comment?
+  system.stateVersion = "23.05"; # Did you read the comment?
 
   # The nix-bitcoin release version that your config is compatible with.
   # When upgrading to a backwards-incompatible release, nix-bitcoin will display an
diff --git a/flake.lock b/flake.lock
index 4c7eb5d..b0a1f29 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,16 +43,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688392541,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "lastModified": 1688764204,
+        "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 0c260e6..391f2c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
   '';
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     extra-container = {
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 1974dc3..aeb8ac0 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -2,17 +2,17 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
-    lndconnect;
-
-  inherit (pkgsUnstable)
-    btcpayserver
     charge-lnd
-    clightning
     electrs
     elementsd
     extra-container
     fulcrum
     hwi
+    lndconnect;
+
+  inherit (pkgsUnstable)
+    btcpayserver
+    clightning
     lightning-loop
     lightning-pool
     nbxplorer;
diff --git a/test/clightning-replication.nix b/test/clightning-replication.nix
index a55277e..002fcb9 100644
--- a/test/clightning-replication.nix
+++ b/test/clightning-replication.nix
@@ -101,7 +101,7 @@ makeTestVM {
 
   testScript =  { nodes, ... }: let
     systems = builtins.concatStringsSep ", "
-      (mapAttrsToList (name: node: ''"${name}": "${node.config.system.build.toplevel}"'') nodes);
+      (mapAttrsToList (name: node: ''"${name}": "${node.system.build.toplevel}"'') nodes);
   in ''
     systems = { ${systems} }
 
diff --git a/test/lib/make-test.nix b/test/lib/make-test.nix
index 7ac85b2..16e2192 100644
--- a/test/lib/make-test.nix
+++ b/test/lib/make-test.nix
@@ -23,7 +23,7 @@ let
     };
 
     testScript = nodes: let
-      cfg = nodes.nodes.machine.config;
+      cfg = nodes.nodes.machine;
       data = {
         data = cfg.test.data;
         tests = cfg.tests;
diff --git a/test/tests.nix b/test/tests.nix
index f231570..601e57a 100644
--- a/test/tests.nix
+++ b/test/tests.nix
@@ -390,7 +390,10 @@ in {
             config
           ];
           # Share the same pkgs instance among tests
-          nixpkgs.pkgs = pkgs.lib.mkDefault pkgs;
+          # Set priority slightly higher (i.e. to a slightly lower number) than `mkDefault`,
+          # so that this module can be used with function `pkgs.nixos`, which already
+          # sets `nixpkgs.pkgs` with prio `mkDefault`.
+          nixpkgs.pkgs = lib.mkOverride 900 pkgs;
         };
       };