aiolabs/nix-bitcoin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

update to NixOS 25.05

Browse source
This commit is contained in:
Erik Arvstedt 2025-06-01 23:05:53 +02:00
parent 120daaaaa3
commit 9808a5e5d4
No known key found for this signature in database
GPG key ID: 33312B944DD97846
8 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

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

2
dev/README.md
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 24.11` - Run command `update-flake.sh 25.05`
- Treewide: check if any `TODO-EXTERNAL` comments can be resolved - Treewide: check if any `TODO-EXTERNAL` comments can be resolved

2
examples/configuration.nix
View file

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

2
examples/container/flake.nix
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-24.11"; # nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.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";

2
examples/flakes/flake.nix
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-24.11"; # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-25.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";

8
flake.lock generated
View file

@ -44,16 +44,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748037224, "lastModified": 1749237914,
"narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -5,7 +5,7 @@
''; '';
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
extra-container = { extra-container = {

17
pkgs/pinned.nix
View file

@ -2,13 +2,6 @@
pkgs: pkgsUnstable: pkgs: pkgsUnstable:
{ {
inherit (pkgs) inherit (pkgs)
extra-container
hwi
lightning-loop
lightning-pool
lndconnect;
inherit (pkgsUnstable)
bitcoin bitcoin
bitcoind bitcoind
bitcoind-knots bitcoind-knots
@ -18,8 +11,16 @@ pkgs: pkgsUnstable:
clightning clightning
electrs electrs
elementsd elementsd
extra-container
fulcrum fulcrum
lnd; hwi
lightning-loop
lightning-pool
lnd
lndconnect;
inherit (pkgsUnstable)
;
inherit pkgs pkgsUnstable; inherit pkgs pkgsUnstable;
} }