nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update 21.11 references to 22.05

Browse source
This commit is contained in:
Alexander Sosedkin 2022-06-27 12:31:24 +02:00
parent 5ac02d0a7b
commit fd02e666d8
9 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -53,7 +53,7 @@ for example:
{ {
environment.packages = [ pkgs.vim ]; 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 ]; 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: 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 nix-channel --update
``` ```
2. Configure `home-manager`: 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 # Read nix-on-droid changelog before changing this value
system.stateVersion = "21.11"; system.stateVersion = "22.05";
# insert nix-on-droid config # insert nix-on-droid config
@ -98,7 +98,7 @@ To enable `home-manager` you simply need to follow the instructions already prov
{ pkgs, ... }: { pkgs, ... }:
{ {
# Read home-manager changelog before changing this value # Read home-manager changelog before changing this value
home.stateVersion = "21.11"; home.stateVersion = "22.05";
# insert home-manager config # 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"; description = "nix-on-droid configuration";
inputs = { 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.url = "github:t184256/nix-on-droid";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; 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"; description = "nix-on-droid configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
home-manager.url = "github:nix-community/home-manager/release-21.11"; home-manager.url = "github:nix-community/home-manager/release-22.05";
nix-on-droid.url = "github:t184256/nix-on-droid"; nix-on-droid.url = "github:t184256/nix-on-droid";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
nix-on-droid.inputs.home-manager.follows = "home-manager"; nix-on-droid.inputs.home-manager.follows = "home-manager";

6
modules/build/initial-build.nix
View file

@ -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, ... }: { config, lib, pkgs, ... }:
@ -13,13 +13,13 @@ with lib;
build.channel = { build.channel = {
nixpkgs = mkOption { nixpkgs = mkOption {
type = types.str; type = types.str;
default = "https://nixos.org/channels/nixos-21.11"; default = "https://nixos.org/channels/nixos-22.05";
description = "Channel URL for nixpkgs."; description = "Channel URL for nixpkgs.";
}; };
nix-on-droid = mkOption { nix-on-droid = mkOption {
type = types.str; 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."; description = "Channel URL for nix-on-droid.";
}; };
}; };

6
modules/environment/login/nix-on-droid.nix.default
View file

@ -28,17 +28,17 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "21.11"; system.stateVersion = "22.05";
# After installing home-manager channel like # 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 # nix-channel --update
# you can configure home-manager in here like # you can configure home-manager in here like
#home-manager.config = #home-manager.config =
# { pkgs, lib, ... }: # { pkgs, lib, ... }:
# { # {
# # Read the changelog before changing this value # # Read the changelog before changing this value
# home.stateVersion = "21.11"; # home.stateVersion = "22.05";
# #
# # Use the same overlays as the system packages # # Use the same overlays as the system packages
# nixpkgs = { inherit (config.nixpkgs) overlays; }; # nixpkgs = { inherit (config.nixpkgs) overlays; };

4
modules/version.nix
View file

@ -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, ... }: { config, lib, pkgs, ... }:
@ -11,7 +11,7 @@ with lib;
options = { options = {
system.stateVersion = mkOption { 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"; default = "19.09";
description = '' description = ''
It is occasionally necessary for nix-on-droid to change It is occasionally necessary for nix-on-droid to change

4
tests/on-device/config-flake-h-m.cfg.nix
View file

@ -1,7 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
system.stateVersion = "21.11"; system.stateVersion = "22.05";
# no nixpkgs.overlays defined # no nixpkgs.overlays defined
environment.packages = with pkgs; [ zsh ]; environment.packages = with pkgs; [ zsh ];
@ -9,7 +9,7 @@
home-manager.config = home-manager.config =
{ pkgs, ... }: { pkgs, ... }:
{ {
home.stateVersion = "21.11"; home.stateVersion = "22.05";
nixpkgs.overlays = config.nixpkgs.overlays; nixpkgs.overlays = config.nixpkgs.overlays;
home.packages = with pkgs; [ dash ]; home.packages = with pkgs; [ dash ];

4
tests/on-device/config-flake-h-m.flake.nix
View file

@ -2,8 +2,8 @@
description = "nix-on-droid configuration"; description = "nix-on-droid configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
home-manager.url = "github:nix-community/home-manager/release-21.11"; home-manager.url = "github:nix-community/home-manager/release-22.05";
nix-on-droid.url = "<<FLAKE_URL>>"; nix-on-droid.url = "<<FLAKE_URL>>";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
nix-on-droid.inputs.home-manager.follows = "home-manager"; nix-on-droid.inputs.home-manager.follows = "home-manager";

2
tests/on-device/config-flake.nix
View file

@ -2,7 +2,7 @@
description = "nix-on-droid configuration"; description = "nix-on-droid configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-21.11"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
nix-on-droid.url = "<<FLAKE_URL>>"; nix-on-droid.url = "<<FLAKE_URL>>";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
}; };

4
tests/on-device/config-h-m.bats
View file

@ -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 load lib
@ -21,7 +21,7 @@ teardown() {
[[ ! -e ~/.config/example ]] [[ ! -e ~/.config/example ]]
# set up / build / activate the configuration # 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 nix-channel --update
cp "$ON_DEVICE_TESTS_DIR/config-h-m.nix" ~/.config/nixpkgs/nix-on-droid.nix cp "$ON_DEVICE_TESTS_DIR/config-h-m.nix" ~/.config/nixpkgs/nix-on-droid.nix
nix-on-droid switch nix-on-droid switch

4
tests/on-device/config-h-m.nix
View file

@ -1,12 +1,12 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
system.stateVersion = "21.11"; system.stateVersion = "22.05";
home-manager.config = home-manager.config =
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
home.stateVersion = "21.11"; home.stateVersion = "22.05";
nixpkgs = { inherit (config.nixpkgs) overlays; }; nixpkgs = { inherit (config.nixpkgs) overlays; };
# example config # example config