udpate nixos 25.11 -> 26.05

This commit is contained in:
Jonas Nick
2026-08-08 06:54:06 +00:00
parent 360e30fee5
commit e8328251af
9 changed files with 16 additions and 15 deletions
+1 -1
View File
@@ -97,5 +97,5 @@ It's easiest to use an existing service as a template:
Most other services use packages that are already included in nixpkgs. Most other services use packages that are already included in nixpkgs.
## Switching to a new NixOS release ## Switching to a new NixOS release
- Run command `update-flake.sh 25.11` - Run command `update-flake.sh 26.05`
- Treewide: check if any `TODO-EXTERNAL` comments can be resolved - Treewide: check if any `TODO-EXTERNAL` comments can be resolved
+1 -1
View File
@@ -324,7 +324,7 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.11"; # Did you read the comment? system.stateVersion = "26.05"; # Did you read the comment?
# The nix-bitcoin release version that your config is compatible with. # The nix-bitcoin release version that your config is compatible with.
# When upgrading to a backwards-incompatible release, nix-bitcoin will display an # When upgrading to a backwards-incompatible release, nix-bitcoin will display an
+1 -1
View File
@@ -12,7 +12,7 @@
inputs = { inputs = {
nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release"; nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
# You can also use a version branch to track a specific NixOS release # You can also use a version branch to track a specific NixOS release
# nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.11"; # nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-26.05";
nixpkgs.follows = "nix-bitcoin/nixpkgs"; nixpkgs.follows = "nix-bitcoin/nixpkgs";
nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable"; nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable";
+1 -1
View File
@@ -10,7 +10,7 @@
inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release"; inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release";
# You can also use a version branch to track a specific NixOS release # You can also use a version branch to track a specific NixOS release
# inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.11"; # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-26.05";
inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs"; inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs";
inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable"; inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable";
Generated
+4 -4
View File
@@ -44,16 +44,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1782847189, "lastModified": 1784432872,
"narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
+1 -1
View File
@@ -5,7 +5,7 @@
''; '';
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs-25_05.url = "github:NixOS/nixpkgs/nixos-25.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
+4 -4
View File
@@ -4,18 +4,18 @@ pkgs: pkgsUnstable: pkgs-25_05:
inherit (pkgs) inherit (pkgs)
bitcoin bitcoin
bitcoind bitcoind
btcpayserver
charge-lnd charge-lnd
clboss
clightning
electrs electrs
elementsd
extra-container extra-container
lightning-pool lightning-pool
lndconnect; lndconnect;
inherit (pkgsUnstable) inherit (pkgsUnstable)
bitcoind-knots bitcoind-knots
btcpayserver
clboss
clightning
elementsd
fulcrum fulcrum
lightning-loop lightning-loop
lnd; lnd;
+2 -2
View File
@@ -22,8 +22,8 @@ let
test.shellcheckServices.enable = true; test.shellcheckServices.enable = true;
}; };
testScript = nodes: let testScript = { nodes, ... }: let
cfg = nodes.nodes.machine; cfg = nodes.machine;
data = { data = {
data = cfg.test.data; data = cfg.test.data;
tests = cfg.tests; tests = cfg.tests;
+1
View File
@@ -1,5 +1,6 @@
from collections import OrderedDict from collections import OrderedDict
import json import json
import os
import re import re
def succeed(*cmds): def succeed(*cmds):