From a3ded4cf7461e49b2b4f077a8924cf030ad8363b Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 13 Dec 2024 23:21:23 +0100 Subject: [PATCH] update to NixOS 24.11 --- .cirrus.yml | 2 +- examples/configuration.nix | 2 +- examples/flakes/flake.nix | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- pkgs/pinned.nix | 15 ++++++++------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ec1a317..058ea3e 100644 --- a/.cirrus.yml +++ b/.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 diff --git a/examples/configuration.nix b/examples/configuration.nix index f4871a9..0f4918f 100644 --- a/examples/configuration.nix +++ b/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 diff --git a/examples/flakes/flake.nix b/examples/flakes/flake.nix index d273cee..63b69c4 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-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"; diff --git a/flake.lock b/flake.lock index 72117e1..0381945 100644 --- a/flake.lock +++ b/flake.lock @@ -43,16 +43,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732749044, - "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 04c4a24..b78e459 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ ''; 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 = { diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index c113af0..4bf6082 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.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; }