update to nixos 23.05

.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

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

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

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

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;

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

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;

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