Merge #750: Update to NixOS 24.11

b5e5974 flake: update extra-container (Erik Arvstedt)
2d53b57 tests.py: fix syntax warning (Erik Arvstedt)
09ba739 nbxplorer: remove deprecated option (Erik Arvstedt)
d6bae0a python3Packages.clnrest: update to NixOS 24.11 (Erik Arvstedt)
b78116b python3Packages.clnrest: use `--replace-fail` (Erik Arvstedt)
dc8f969 python3Packages.pyln-proto: update to NixOS 24.11 (Erik Arvstedt)
8af7fc4 python3Packages.joinmarket: update to NixOS 24.11 (Erik Arvstedt)
c66a6aa python3Packages.joinmarket: allow Python 3.12 (Erik Arvstedt)
3ce3a00 modules: update to NixOS 24.11 (Erik Arvstedt)
a3ded4c update to NixOS 24.11 (Erik Arvstedt)
ba46d20 update-flake.sh: add workflow for updating the NixOS version (Erik Arvstedt)
f60a506 update-flake.sh: remove support for Nix < 2.19 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b5e5974

Tree-SHA512: a252a2e20266924c58877aebe03a25ef65166cf8404ecf6a5f8a0b0eb5bf569ec5f13894d08723058c8d6b354378c609cb626f6866f152b06d26e8a73181f02c

Author: jonasnick

.cirrus.yml

@@ -9,7 +9,7 @@ task:
 
   container:
     # Defined in https://github.com/nix-community/docker-nixpkgs
-    image: nixpkgs/nix-flakes:nixos-24.05
+    image: nixpkgs/nix-flakes:nixos-24.11
 
   matrix:
     - name: modules_test

dev/README.md

@@ -97,8 +97,7 @@ It's easiest to use an existing service as a template:
   Most other services use packages that are already included in nixpkgs.
 
 ## Switching to a new NixOS release
-
-- [flake.nix](../flake.nix): update `nixpkgs.url`
+- Run command `update-flake.sh 24.11`
 - [cirrus.yml](../.cirrus.yml): update toplevel container -> image attribute
 - [examples/configuration.nix](../examples/configuration.nix): update `system.stateVersion`
 - [examples/flakes/flake.nix](../examples/flakes/flake.nix): update `inputs.nix-bitcoin.url`

examples/configuration.nix

@@ -318,7 +318,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 = "24.05"; # Did you read the comment?
+  system.stateVersion = "24.11"; # 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

examples/flakes/flake.nix

@@ -10,7 +10,7 @@
 
   inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
   # You can also use a version branch to track a specific NixOS release
-  # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-24.05";
+  # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-24.11";
 
   inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs";
   inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable";

flake.lock

@@ -5,11 +5,11 @@
   '';
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     extra-container = {
-      url = "github:erikarvstedt/extra-container";
+      url = "github:erikarvstedt/extra-container/0.13";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };

flake.nix

@@ -2,7 +2,9 @@
 set -euo pipefail
 
 # This script does the following:
-# - Update all flake inputs, including nixpkgs
+# - When called without arguments, update all flake inputs, including nixpkgs.
+# - When called with a version argument, set input `nixpkgs` in `flake.nix` to the
+#   specified version and only update this input.
 # - Print version updates of pinned pkgs like so:
 #     Pkg updates in nixpkgs unstable:
 #     bitcoin: 0.20.0 -> 0.21.1
@@ -39,23 +41,11 @@ if [[ $forceRun ]] && ! git diff --quiet ../flake.{nix,lock}; then
     exit 1
 fi
 
-# Support Nix >=2.19
-{
-    versionGreaterThanOrEqual() {
-        [[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) || $1 == "$2" ]]
-    }
-    nixVersion=$(nix --version | cut -d\  -f 3)
-    if versionGreaterThanOrEqual "$nixVersion" 2.19; then
-        # https://nixos.org/manual/nix/stable/release-notes/rl-2.19#:~:text=nix%20flake%20update
-        nixUpdateArg=--flake
-    else
-        nixUpdateArg=
-    fi
-}
-
-echo "Updating flake 'nixos-search'"
-nix flake update $nixUpdateArg ../test/nixos-search
-echo
+if [[ ! $nixosVersion ]]; then
+    echo "Updating flake 'nixos-search'"
+    nix flake update --flake ../test/nixos-search
+    echo
+fi
 
 versions=$(nix eval --json -f update-flake.nix versions)
 
@@ -65,8 +55,10 @@ versions=$(nix eval --json -f update-flake.nix versions)
 echo "Updating main flake"
 if [[ $nixosVersion ]]; then
     sed -Ei "s|(nixpkgs.url = .*nixos-)[^\"]+|\1$nixosVersion|" ../flake.nix
+    nix flake update nixpkgs --flake ..
+else
+    nix flake update --flake ..
 fi
-nix flake update $nixUpdateArg ..
 
 echo
 nix eval --raw -f update-flake.nix --argstr prevVersions "$versions" showUpdates; echo

helper/update-flake.sh

@@ -168,7 +168,6 @@ in {
           lbtcnodeendpoint=${nbLib.addressWithPort liquidd.address liquidd.whitelistedPort}
         ''}
         postgres=User ID=${cfg.nbxplorer.user};Host=/run/postgresql;Database=nbxplorer
-        automigrate=1
       '';
     in rec {
       wantedBy = [ "multi-user.target" ];

modules/btcpayserver.nix

@@ -91,7 +91,7 @@ let
   enabledServices = filterAttrs (n: v: isEnabled n) cfg.services;
   isEnabled = x: config.services.${x}.enable;
 
-  ip = "${pkgs.iproute}/bin/ip";
+  ip = "${pkgs.iproute2}/bin/ip";
   iptables = "${config.networking.firewall.package}/bin/iptables";
 
   bridgeIp = "169.254.${toString cfg.addressblock}.10";

modules/netns-isolation.nix

@@ -2,24 +2,25 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
-    charge-lnd
-    elementsd
-    extra-container
-    lightning-pool
-    lndconnect;
-
-  inherit (pkgsUnstable)
     bitcoin
     bitcoind
     btcpayserver
+    charge-lnd
     clboss
     clightning
     electrs
+    elementsd
+    extra-container
     fulcrum
     hwi
     lightning-loop
+    lightning-pool
     lnd
+    lndconnect
     nbxplorer;
 
+  inherit (pkgsUnstable)
+    ;
+
   inherit pkgs pkgsUnstable;
 }