diff --git a/README.md b/README.md index 2ad28d1..6e83ab0 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ for example: { environment.packages = [ pkgs.vim ]; - system.stateVersion = "21.11"; + system.stateVersion = "22.05"; } ``` @@ -67,7 +67,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key { environment.packages = [ pkgs.vim ]; - system.stateVersion = "21.11"; + system.stateVersion = "22.05"; }; } ``` @@ -81,7 +81,7 @@ To enable `home-manager` you simply need to follow the instructions already prov 1. Add `home-manager` channel: ``` - nix-channel --add https://github.com/rycee/home-manager/archive/release-21.11.tar.gz home-manager + nix-channel --add https://github.com/rycee/home-manager/archive/release-22.05.tar.gz home-manager nix-channel --update ``` 2. Configure `home-manager`: @@ -90,7 +90,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 = "21.11"; + system.stateVersion = "22.05"; # insert nix-on-droid config @@ -98,7 +98,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 = "21.11"; + home.stateVersion = "22.05"; # insert home-manager config }; @@ -170,7 +170,7 @@ Do not run `nix profile` because this will render your environment incompatible description = "nix-on-droid configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; nix-on-droid.url = "github:t184256/nix-on-droid"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -193,8 +193,8 @@ Do not run `nix profile` because this will render your environment incompatible description = "nix-on-droid configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; - home-manager.url = "github:nix-community/home-manager/release-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; + home-manager.url = "github:nix-community/home-manager/release-22.05"; nix-on-droid.url = "github:t184256/nix-on-droid"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; nix-on-droid.inputs.home-manager.follows = "home-manager"; diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix index 9475f6c..61a1540 100644 --- a/modules/build/initial-build.nix +++ b/modules/build/initial-build.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, pkgs, ... }: @@ -13,13 +13,13 @@ with lib; build.channel = { nixpkgs = mkOption { type = types.str; - default = "https://nixos.org/channels/nixos-21.11"; + default = "https://nixos.org/channels/nixos-22.05"; description = "Channel URL for nixpkgs."; }; nix-on-droid = mkOption { type = types.str; - default = "https://github.com/t184256/nix-on-droid/archive/release-21.11.tar.gz"; + default = "https://github.com/t184256/nix-on-droid/archive/release-22.05.tar.gz"; description = "Channel URL for nix-on-droid."; }; }; diff --git a/modules/environment/login/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default index a02d814..c99f92e 100644 --- a/modules/environment/login/nix-on-droid.nix.default +++ b/modules/environment/login/nix-on-droid.nix.default @@ -28,17 +28,17 @@ environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "21.11"; + system.stateVersion = "22.05"; # After installing home-manager channel like - # nix-channel --add https://github.com/rycee/home-manager/archive/release-21.11.tar.gz home-manager + # nix-channel --add https://github.com/rycee/home-manager/archive/release-22.05.tar.gz home-manager # nix-channel --update # you can configure home-manager in here like #home-manager.config = # { pkgs, lib, ... }: # { # # Read the changelog before changing this value - # home.stateVersion = "21.11"; + # home.stateVersion = "22.05"; # # # Use the same overlays as the system packages # nixpkgs = { inherit (config.nixpkgs) overlays; }; diff --git a/modules/version.nix b/modules/version.nix index 10166f8..3fc4152 100644 --- a/modules/version.nix +++ b/modules/version.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, pkgs, ... }: @@ -11,7 +11,7 @@ with lib; options = { system.stateVersion = mkOption { - type = types.enum [ "19.09" "20.03" "20.09" "21.05" "21.11" ]; + type = types.enum [ "19.09" "20.03" "20.09" "21.05" "21.11" "22.05" ]; default = "19.09"; description = '' It is occasionally necessary for nix-on-droid to change diff --git a/tests/on-device/config-flake-h-m.cfg.nix b/tests/on-device/config-flake-h-m.cfg.nix index 2785fb0..a4da255 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 = "21.11"; + system.stateVersion = "22.05"; # no nixpkgs.overlays defined environment.packages = with pkgs; [ zsh ]; @@ -9,7 +9,7 @@ home-manager.config = { pkgs, ... }: { - home.stateVersion = "21.11"; + home.stateVersion = "22.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 a3bc9d2..6b060c7 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-21.11"; - home-manager.url = "github:nix-community/home-manager/release-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; + home-manager.url = "github:nix-community/home-manager/release-22.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 8dbd87e..ef616c6 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-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-22.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 c7a065a..d90b03d 100644 --- a/tests/on-device/config-h-m.bats +++ b/tests/on-device/config-h-m.bats @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2022, 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-21.11.tar.gz home-manager + nix-channel --add https://github.com/rycee/home-manager/archive/release-22.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 3da5cf1..c68ae47 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 = "21.11"; + system.stateVersion = "22.05"; home-manager.config = { pkgs, lib, ... }: { - home.stateVersion = "21.11"; + home.stateVersion = "22.05"; nixpkgs = { inherit (config.nixpkgs) overlays; }; # example config