Skip to content

Commit

Permalink
Merge #718: Update to Nixos 24.05
Browse files Browse the repository at this point in the history
2a9489e tests/flake: check flake outputs for all systems (Erik Arvstedt)
b7bce52 examples: fix call to `start-bash-session.sh` (Erik Arvstedt)
5d0907b test/nixos-search: fix running `flake-info` in an offline environment (Erik Arvstedt)
3cc6010 test/nixos-search/ci-test.sh: remove unneded setup step (Erik Arvstedt)
22c1424 backups: fix for nixos 24.05 (Erik Arvstedt)
69b3d5f bitcoind: fix module warning (Erik Arvstedt)
e8e5d8c python3Packages.joinmarket: update to nixos 24.05 (Erik Arvstedt)
7f8563a python3Packages.pyln-proto: update to nixos 24.05 (Erik Arvstedt)
5d463b1 treewide: remove `buildPythonPackageWithDepsCheck` (Erik Arvstedt)
fc703c3 treewide: remove obsolete `mdDoc` (Erik Arvstedt)
83eb1de update to nixos 24.05 (Erik Arvstedt)
7daab61 rtl: remove unused pkg arg (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 2a9489e

Tree-SHA512: 1e88d52b52050ea39c18570eb22b3b83471ebbf30d7ba77f212947ffaaf80ebb851782aa6a5e42752bdfb0db00fa31d5fb9cebb7f42a50145acfeeef1c1aa934
  • Loading branch information
jonasnick committed Jul 22, 2024
2 parents 929b0db + 2a9489e commit 1c6e35e
Show file tree
Hide file tree
Showing 61 changed files with 402 additions and 357 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ task:

container:
# Defined in https://github.com/nix-community/docker-nixpkgs
image: nixpkgs/nix-flakes:nixos-23.11
image: nixpkgs/nix-flakes:nixos-24.05

matrix:
- name: modules_test
Expand All @@ -34,7 +34,7 @@ task:

- name: flake
build_script:
- nix flake check
- nix flake check --all-systems
- ./test/nixos-search/ci-test.sh

- name: shellcheck
Expand Down
2 changes: 1 addition & 1 deletion examples/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.11"; # Did you read the comment?
system.stateVersion = "24.05"; # 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
Expand Down
2 changes: 1 addition & 1 deletion examples/deploy-krops.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ c nodeinfo

case ${1:-} in
-i|--interactive)
. start-bash-session.sh
. ./start-bash-session.sh
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion examples/deploy-qemu-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ c nodeinfo

case ${1:-} in
-i|--interactive)
. start-bash-session.sh
. ./start-bash-session.sh
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion examples/flakes/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.11";
# inputs.nix-bitcoin.url = "github:fort-nix/nix-bitcoin/nixos-24.05";

inputs.nixpkgs.follows = "nix-bitcoin/nixpkgs";
inputs.nixpkgs-unstable.follows = "nix-bitcoin/nixpkgs-unstable";
Expand Down
14 changes: 7 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'';

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
extra-container = {
Expand Down
18 changes: 8 additions & 10 deletions modules/backups.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let
enable = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
description = ''
Enable backups of node data.
This uses the NixOS duplicity service.
To further configure the backup, you can set NixOS options `services.duplicity.*`.
Expand All @@ -16,34 +16,34 @@ let
with-bulk-data = mkOption {
type = types.bool;
default = false;
description = mdDoc ''
description = ''
Whether to also backup Bitcoin blockchain and other bulk data.
'';
};
destination = mkOption {
type = types.str;
default = "file:///var/lib/localBackups";
description = mdDoc ''
description = ''
Where to back up to.
'';
};
frequency = mkOption {
type = types.nullOr types.str;
default = null;
description = mdDoc ''
description = ''
Run backup with the given frequency. If null, do not run automatically.
'';
};
postgresqlDatabases = mkOption {
type = types.listOf types.str;
default = [];
description = mdDoc "List of database names to backup.";
description = "List of database names to backup.";
};
extraFiles = mkOption {
type = types.listOf types.str;
default = [];
example = [ "/var/lib/nginx" ];
description = mdDoc "Additional files to be appended to filelist.";
description = "Additional files to be appended to filelist.";
};
};

Expand All @@ -52,7 +52,7 @@ let
# Potential backup file paths are matched against filelist
# entries from top to bottom.
# The first match determines inclusion or exclusion.
filelist = builtins.toFile "filelist.txt" ''
includeFileList = builtins.toFile "filelist.txt" ''
${builtins.concatStringsSep "\n" cfg.extraFiles}
${optionalString (!cfg.with-bulk-data) ''
Expand Down Expand Up @@ -95,9 +95,7 @@ in {

services.duplicity = {
enable = true;
extraFlags = [
"--include-filelist" "${filelist}"
];
inherit includeFileList;
fullIfOlderThan = mkDefault "1M";
targetUrl = cfg.destination;
frequency = cfg.frequency;
Expand Down
Loading

0 comments on commit 1c6e35e

Please sign in to comment.