From f636824b08269640da482b42f2df8ce4d937580d Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Sun, 18 Jun 2023 10:31:47 +0200 Subject: [PATCH] set stable version to 23.05 --- CHANGELOG.md | 4 +++- README.md | 14 +++++++------- docs/manual.xml | 6 +++--- modules/build/initial-build.nix | 6 +++--- modules/environment/login/nix-on-droid.nix.default | 6 +++--- modules/version.nix | 3 ++- pkgs/default.nix | 4 ++-- templates/advanced/flake.nix | 6 +++--- templates/advanced/home.nix | 2 +- templates/advanced/nix-on-droid.nix | 2 +- templates/home-manager/flake.nix | 6 +++--- templates/home-manager/nix-on-droid.nix | 4 ++-- templates/minimal/flake.nix | 4 ++-- templates/minimal/nix-on-droid.nix | 2 +- tests/on-device/config-flake-default.nix | 2 +- tests/on-device/config-flake-h-m.cfg.nix | 4 ++-- tests/on-device/config-flake-h-m.flake.nix | 4 ++-- tests/on-device/config-flake.nix | 2 +- tests/on-device/config-h-m.bats | 4 ++-- tests/on-device/config-h-m.nix | 4 ++-- 20 files changed, 46 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6685b3..678b8d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## Release 23.05 (unreleased) +## Release 23.11 (unreleased) + +## Release 23.05 ### New Options diff --git a/README.md b/README.md index bd7d120..f05343b 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ for example: { environment.packages = [ pkgs.vim ]; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; } ``` @@ -67,7 +67,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key { environment.packages = [ pkgs.vim ]; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; }; } ``` @@ -80,7 +80,7 @@ To enable `home-manager` you simply need to follow the instructions already prov 1. Add `home-manager` channel: ```sh - nix-channel --add https://github.com/rycee/home-manager/archive/release-22.11.tar.gz home-manager + nix-channel --add https://github.com/rycee/home-manager/archive/release-23.05.tar.gz home-manager nix-channel --update ``` 2. Configure `home-manager`: @@ -89,7 +89,7 @@ To enable `home-manager` you simply need to follow the instructions already prov { # Read Nix-on-Droid changelog before changing this value - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # insert Nix-on-Droid config @@ -97,7 +97,7 @@ To enable `home-manager` you simply need to follow the instructions already prov { pkgs, ... }: { # Read home-manager changelog before changing this value - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; # insert home-manager config }; @@ -181,10 +181,10 @@ A minimal example could look like the following: description = "Minimal example of Nix-on-Droid system config."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nix-on-droid = { - url = "github:t184256/nix-on-droid/release-22.11"; + url = "github:t184256/nix-on-droid/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/docs/manual.xml b/docs/manual.xml index 8ce46ab..45b7c39 100644 --- a/docs/manual.xml +++ b/docs/manual.xml @@ -1,4 +1,4 @@ - + { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nix-on-droid = { - url = "github:t184256/nix-on-droid/release-22.11"; + url = "github:t184256/nix-on-droid/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix index 208b779..e8828ac 100644 --- a/modules/build/initial-build.nix +++ b/modules/build/initial-build.nix @@ -1,12 +1,12 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, pkgs, ... }: with lib; let - defaultNixpkgsBranch = "nixos-22.11"; - defaultNixOnDroidBranch = "release-22.11"; + defaultNixpkgsBranch = "nixos-23.05"; + defaultNixOnDroidBranch = "release-23.05"; defaultNixpkgsChannel = "https://nixos.org/channels/${defaultNixpkgsBranch}"; defaultNixOnDroidChannel = "https://github.com/t184256/nix-on-droid/archive/${defaultNixOnDroidBranch}.tar.gz"; diff --git a/modules/environment/login/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default index 465c5f8..d91e0bf 100644 --- a/modules/environment/login/nix-on-droid.nix.default +++ b/modules/environment/login/nix-on-droid.nix.default @@ -28,7 +28,7 @@ environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # Set up nix for flakes #nix.extraOptions = '' @@ -39,7 +39,7 @@ #time.timeZone = "Europe/Berlin"; # After installing home-manager channel like - # nix-channel --add https://github.com/rycee/home-manager/archive/release-22.11.tar.gz home-manager + # nix-channel --add https://github.com/rycee/home-manager/archive/release-23.05.tar.gz home-manager # nix-channel --update # you can configure home-manager in here like #home-manager = { @@ -49,7 +49,7 @@ # { config, lib, pkgs, ... }: # { # # Read the changelog before changing this value - # home.stateVersion = "22.11"; + # home.stateVersion = "23.05"; # # # insert home-manager config # }; diff --git a/modules/version.nix b/modules/version.nix index 608882f..eac575c 100644 --- a/modules/version.nix +++ b/modules/version.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, pkgs, ... }: @@ -20,6 +20,7 @@ with lib; "22.05" "22.11" "23.05" + "23.11" ]; description = '' It is occasionally necessary for Nix-on-Droid to change diff --git a/pkgs/default.nix b/pkgs/default.nix index 90d3c1d..4e7cf70 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. { nixpkgs , system @@ -35,7 +35,7 @@ let pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix }; - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # Fix invoking bash after initial build. user.shell = "${initialPackageInfo.bash}/bin/bash"; diff --git a/templates/advanced/flake.nix b/templates/advanced/flake.nix index 711a58c..2b05631 100644 --- a/templates/advanced/flake.nix +++ b/templates/advanced/flake.nix @@ -2,15 +2,15 @@ description = "Advanced example of Nix-on-Droid system config with home-manager."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:t184256/nix-on-droid/release-22.11"; + url = "github:t184256/nix-on-droid/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/templates/advanced/home.nix b/templates/advanced/home.nix index 0384e5b..74c2493 100644 --- a/templates/advanced/home.nix +++ b/templates/advanced/home.nix @@ -2,7 +2,7 @@ { # Read the changelog before changing this value - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; # insert home-manager config } diff --git a/templates/advanced/nix-on-droid.nix b/templates/advanced/nix-on-droid.nix index 531f8b8..686d786 100644 --- a/templates/advanced/nix-on-droid.nix +++ b/templates/advanced/nix-on-droid.nix @@ -28,7 +28,7 @@ environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # Set up nix for flakes nix.extraOptions = '' diff --git a/templates/home-manager/flake.nix b/templates/home-manager/flake.nix index e8c2d08..1bf85fd 100644 --- a/templates/home-manager/flake.nix +++ b/templates/home-manager/flake.nix @@ -2,15 +2,15 @@ description = "Minimal example of Nix-on-Droid system config with home-manager."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:t184256/nix-on-droid/release-22.11"; + url = "github:t184256/nix-on-droid/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/templates/home-manager/nix-on-droid.nix b/templates/home-manager/nix-on-droid.nix index e421248..9b7d262 100644 --- a/templates/home-manager/nix-on-droid.nix +++ b/templates/home-manager/nix-on-droid.nix @@ -28,7 +28,7 @@ environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # Set up nix for flakes nix.extraOptions = '' @@ -47,7 +47,7 @@ { config, lib, pkgs, ... }: { # Read the changelog before changing this value - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; # insert home-manager config }; diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix index f999ed2..264692a 100644 --- a/templates/minimal/flake.nix +++ b/templates/minimal/flake.nix @@ -2,10 +2,10 @@ description = "Basic example of Nix-on-Droid system config."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nix-on-droid = { - url = "github:t184256/nix-on-droid/release-22.11"; + url = "github:t184256/nix-on-droid/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/templates/minimal/nix-on-droid.nix b/templates/minimal/nix-on-droid.nix index 6b0874c..b98b190 100644 --- a/templates/minimal/nix-on-droid.nix +++ b/templates/minimal/nix-on-droid.nix @@ -28,7 +28,7 @@ environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # Set up nix for flakes nix.extraOptions = '' diff --git a/tests/on-device/config-flake-default.nix b/tests/on-device/config-flake-default.nix index 04c307f..326725f 100644 --- a/tests/on-device/config-flake-default.nix +++ b/tests/on-device/config-flake-default.nix @@ -2,7 +2,7 @@ description = "Nix-on-Droid configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; nix-on-droid.url = "<>"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/tests/on-device/config-flake-h-m.cfg.nix b/tests/on-device/config-flake-h-m.cfg.nix index 3d213a1..6f01150 100644 --- a/tests/on-device/config-flake-h-m.cfg.nix +++ b/tests/on-device/config-flake-h-m.cfg.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; # no nixpkgs.overlays defined environment.packages = with pkgs; [ zsh ]; @@ -9,7 +9,7 @@ home-manager.config = { pkgs, ... }: { - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; nixpkgs.overlays = config.nixpkgs.overlays; home.packages = with pkgs; [ dash ]; diff --git a/tests/on-device/config-flake-h-m.flake.nix b/tests/on-device/config-flake-h-m.flake.nix index a2147e3..8af3a1d 100644 --- a/tests/on-device/config-flake-h-m.flake.nix +++ b/tests/on-device/config-flake-h-m.flake.nix @@ -2,8 +2,8 @@ description = "Nix-on-Droid configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; - home-manager.url = "github:nix-community/home-manager/release-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.05"; nix-on-droid.url = "<>"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; nix-on-droid.inputs.home-manager.follows = "home-manager"; diff --git a/tests/on-device/config-flake.nix b/tests/on-device/config-flake.nix index 00dae1d..9be93e2 100644 --- a/tests/on-device/config-flake.nix +++ b/tests/on-device/config-flake.nix @@ -2,7 +2,7 @@ description = "Nix-on-Droid configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; nix-on-droid.url = "<>"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/tests/on-device/config-h-m.bats b/tests/on-device/config-h-m.bats index bcff5b2..cfa75e0 100644 --- a/tests/on-device/config-h-m.bats +++ b/tests/on-device/config-h-m.bats @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. load lib @@ -21,7 +21,7 @@ teardown() { [[ ! -e ~/.config/example ]] # set up / build / activate the configuration - nix-channel --add https://github.com/rycee/home-manager/archive/release-22.11.tar.gz home-manager + nix-channel --add https://github.com/rycee/home-manager/archive/release-23.05.tar.gz home-manager nix-channel --update cp "$ON_DEVICE_TESTS_DIR/config-h-m.nix" ~/.config/nixpkgs/nix-on-droid.nix nix-on-droid switch diff --git a/tests/on-device/config-h-m.nix b/tests/on-device/config-h-m.nix index fd8c654..9f23a3e 100644 --- a/tests/on-device/config-h-m.nix +++ b/tests/on-device/config-h-m.nix @@ -1,12 +1,12 @@ { pkgs, config, ... }: { - system.stateVersion = "22.11"; + system.stateVersion = "23.05"; home-manager.config = { pkgs, lib, ... }: { - home.stateVersion = "22.11"; + home.stateVersion = "23.05"; nixpkgs = { inherit (config.nixpkgs) overlays; }; # example config