From ef55157fb7a90c68a17bfa41d7d6fa6e3e673018 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sun, 5 Dec 2021 16:24:11 +0100 Subject: [PATCH] Update stateVersions and channel versions to 21.11 --- .github/workflows/cachix.yml | 2 +- README.md | 12 ++++++------ modules/build/initial-build.nix | 4 ++-- modules/environment/login/nix-on-droid.nix.default | 6 +++--- modules/version.nix | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 6ca58cc..1c71ec3 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2.3.4 - uses: cachix/install-nix-action@v13 with: - nix_path: nixpkgs=channel:nixos-21.05 + nix_path: nixpkgs=channel:nixos-21.11 - uses: cachix/cachix-action@v10 with: name: nix-on-droid diff --git a/README.md b/README.md index ee510c8..0d3d7e5 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ for example: { environment.packages = [ pkgs.vim ]; - system.stateVersion = "21.05"; + system.stateVersion = "21.11"; } ``` @@ -66,7 +66,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key { environment.packages = [ pkgs.vim ]; - system.stateVersion = "21.05"; + system.stateVersion = "21.11"; }; } ``` @@ -80,7 +80,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.05.tar.gz home-manager + nix-channel --add https://github.com/rycee/home-manager/archive/release-21.11.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 = "21.05"; + system.stateVersion = "21.11"; # 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 = "21.05"; + home.stateVersion = "21.11"; # insert home-manager config }; @@ -171,7 +171,7 @@ writing a `flake.nix`: description = "nix-on-droid configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-21.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; nix-on-droid.url = "github:t184256/nix-on-droid/master"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix index 6547f83..9475f6c 100644 --- a/modules/build/initial-build.nix +++ b/modules/build/initial-build.nix @@ -13,13 +13,13 @@ with lib; build.channel = { nixpkgs = mkOption { type = types.str; - default = "https://nixos.org/channels/nixos-21.05"; + default = "https://nixos.org/channels/nixos-21.11"; description = "Channel URL for nixpkgs."; }; nix-on-droid = mkOption { type = types.str; - default = "https://github.com/t184256/nix-on-droid/archive/release-21.05.tar.gz"; + default = "https://github.com/t184256/nix-on-droid/archive/release-21.11.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 77eecc2..1450cb6 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.05"; + system.stateVersion = "21.11"; # After installing home-manager channel like - # nix-channel --add https://github.com/rycee/home-manager/archive/release-21.05.tar.gz home-manager + # nix-channel --add https://github.com/rycee/home-manager/archive/release-21.11.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.05"; + # home.stateVersion = "21.11"; # # # Use the same overlays as the system packages # nixpkgs.overlays = lib.mkIf (lib.hasAttrByPath [ "nixpkgs" "overlays" ] config) config.nixpkgs.overlays; diff --git a/modules/version.nix b/modules/version.nix index 121cf06..10166f8 100644 --- a/modules/version.nix +++ b/modules/version.nix @@ -11,7 +11,7 @@ with lib; options = { system.stateVersion = mkOption { - type = types.enum [ "19.09" "20.03" "20.09" "21.05" ]; + type = types.enum [ "19.09" "20.03" "20.09" "21.05" "21.11" ]; default = "19.09"; description = '' It is occasionally necessary for nix-on-droid to change