From 1676445a51c7e3d3406bd2e1ae6163cde21728b3 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 2 Dec 2023 23:26:48 +0100 Subject: [PATCH] update to NixOS 23.11 --- .cirrus.yml | 2 +- docs/install.md | 6 +++--- examples/configuration.nix | 2 +- examples/flakes/flake.nix | 2 +- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- pkgs/pinned.nix | 14 +++++++------- test/nixos-search/flake.lock | 12 ++++++------ 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 918c891..094d9ac 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-23.05 + image: nixpkgs/nix-flakes:nixos-23.11 matrix: - name: modules_test diff --git a/docs/install.md b/docs/install.md index 77efb0e..a902f4e 100644 --- a/docs/install.md +++ b/docs/install.md @@ -20,9 +20,9 @@ This is borrowed from the [NixOS manual](https://nixos.org/nixos/manual/index.ht 1. Obtain latest [NixOS](https://nixos.org/nixos/download.html). For example: ``` - wget https://releases.nixos.org/nixos/23.05/nixos-23.05.3701.e9b4b56e5a20/nixos-minimal-23.05.3701.e9b4b56e5a20-x86_64-linux.iso - sha256sum nixos-minimal-23.05.3701.e9b4b56e5a20-x86_64-linux.iso - # output: 0bbc1919654a6b3212f7bdc9faf9e7a89ba5607e626e8d651a1cbb79ce2831c2 + wget https://releases.nixos.org/nixos/23.11/nixos-23.11.1494.b4372c4924d9/nixos-minimal-23.11.1494.b4372c4924d9-x86_64-linux.iso + sha256sum nixos-minimal-23.11.1494.b4372c4924d9-x86_64-linux.iso + # output: f48cf810432c1f04b291c947b36f824823dfef8ebfa0e1906602a516450189d8 ``` Alternatively you can build NixOS from source by following the instructions at https://nixos.org/nixos/manual/index.html#sec-building-cd. diff --git a/examples/configuration.nix b/examples/configuration.nix index b6af8e2..3cdabf4 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 = "23.05"; # Did you read the comment? + system.stateVersion = "23.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 355c400..9b018f5 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-23.05"; + # inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-23.11"; inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs"; inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable"; diff --git a/flake.lock b/flake.lock index a63c3cc..a4415ba 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -43,27 +43,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701053011, - "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", + "lastModified": 1702233072, + "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", + "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1701040486, - "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", + "lastModified": 1701336116, + "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45827faa2132b8eade424f6bdd48d8828754341a", + "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 391f2c1..71eb100 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ ''; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.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 69ca811..65061b7 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -4,21 +4,21 @@ pkgs: pkgsUnstable: inherit (pkgs) bitcoin bitcoind - charge-lnd - elementsd - extra-container - lndconnect; - - inherit (pkgsUnstable) btcpayserver + charge-lnd clightning electrs - fulcrum + elementsd + extra-container hwi lightning-loop lightning-pool lnd + lndconnect nbxplorer; + inherit (pkgsUnstable) + fulcrum; + inherit pkgs pkgsUnstable; } diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 177d2b4..8cd93bf 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -18,11 +18,11 @@ "nixos-org-configurations": { "flake": false, "locked": { - "lastModified": 1688381214, - "narHash": "sha256-0g/rZUiXIk1H6D6Oa1VcK41REeIRGSdVDPAFVqZKf1E=", + "lastModified": 1701287284, + "narHash": "sha256-tu30FJa7e8eZCZg0CmQuAGimFQ/RVPooTFl59SiELxY=", "owner": "NixOS", "repo": "nixos-org-configurations", - "rev": "083c137b7ae19a1a8d6822fea7ca30aeeda72ac8", + "rev": "33bc481f102213c0c4e41cd356e7bcf1aea28107", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "npmlock2nix": "npmlock2nix" }, "locked": { - "lastModified": 1693902773, - "narHash": "sha256-JFsiBAixnnkkPBl1RvnSvRKUiOZxwF6lXnm70LUIW4w=", + "lastModified": 1701444930, + "narHash": "sha256-in+L+Qv85ClccGe4u21czoUZABpS/HC89iPDAcBp9qE=", "owner": "nixos", "repo": "nixos-search", - "rev": "00f61f52aefe60b18059ec13201d9c94bdc04045", + "rev": "744ec58e082a3fcdd741b2c9b0654a0f7fda4603", "type": "github" }, "original": {