From 4303550ce3e466fae1b28d305e83cd8075d22dc4 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 22 Dec 2025 16:27:02 +0100 Subject: [PATCH] update to NixOS 25.11 --- dev/README.md | 2 +- examples/configuration.nix | 2 +- examples/container/flake.nix | 2 +- examples/flakes/flake.nix | 2 +- flake.lock | 14 +++++++------- flake.nix | 2 +- pkgs/pinned.nix | 17 +++++++++-------- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dev/README.md b/dev/README.md index ff6c038..23ede16 100644 --- a/dev/README.md +++ b/dev/README.md @@ -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. ## Switching to a new NixOS release -- Run command `update-flake.sh 25.05` +- Run command `update-flake.sh 25.11` - Treewide: check if any `TODO-EXTERNAL` comments can be resolved diff --git a/examples/configuration.nix b/examples/configuration.nix index 125beaa..c942de9 100644 --- a/examples/configuration.nix +++ b/examples/configuration.nix @@ -324,7 +324,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 = "25.05"; # Did you read the comment? + system.stateVersion = "25.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 diff --git a/examples/container/flake.nix b/examples/container/flake.nix index 9401c14..137f2d4 100644 --- a/examples/container/flake.nix +++ b/examples/container/flake.nix @@ -12,7 +12,7 @@ inputs = { nix-bitcoin.url = "github:fort-nix/nix-bitcoin/release"; # You can also use a version branch to track a specific NixOS release - # nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.05"; + # nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.11"; nixpkgs.follows = "nix-bitcoin/nixpkgs"; nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable"; diff --git a/examples/flakes/flake.nix b/examples/flakes/flake.nix index dce09b7..33dbb4b 100644 --- a/examples/flakes/flake.nix +++ b/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-25.05"; + # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.11"; inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs"; inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable"; diff --git a/flake.lock b/flake.lock index 2513cb2..4e3c6ba 100644 --- a/flake.lock +++ b/flake.lock @@ -44,27 +44,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765687488, - "narHash": "sha256-7YAJ6xgBAQ/Nr+7MI13Tui1ULflgAdKh63m1tfYV7+M=", + "lastModified": 1766201043, + "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02bcc33948ca19b0aaa0213fe987ceec1f4ebe1", + "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765934234, - "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "lastModified": 1766314097, + "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", + "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7077d50..873c239 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ ''; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; 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 dd6a95d..3a9ff66 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -2,13 +2,6 @@ pkgs: pkgsUnstable: { inherit (pkgs) - elementsd - extra-container - fulcrum - lightning-pool - lndconnect; - - inherit (pkgsUnstable) bitcoin bitcoind bitcoind-knots @@ -17,8 +10,16 @@ pkgs: pkgsUnstable: clboss clightning electrs + elementsd + extra-container + fulcrum lightning-loop - lnd; + lightning-pool + lnd + lndconnect; + + inherit (pkgsUnstable) + ; inherit pkgs pkgsUnstable; }