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

set stable version to 22.11

Browse source
This commit is contained in:
Tobias Happ 2022-12-01 22:12:40 +01:00
parent edbaea39b7
commit badeed2ceb
20 changed files with 50 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,6 +1,8 @@
# Changelog # Changelog
## Release 22.11 (unreleased) ## Release 23.05 (unreleased)
## Release 22.11
* Terminal font now should be specified using `terminal.font` option, * Terminal font now should be specified using `terminal.font` option,
set it to a TTF file to apply a font. set it to a TTF file to apply a font.

14
README.md
View file

@ -53,7 +53,7 @@ for example:
{ {
environment.packages = [ pkgs.vim ]; environment.packages = [ pkgs.vim ];
system.stateVersion = "22.05"; system.stateVersion = "22.11";
} }
``` ```
@ -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 = "22.05"; system.stateVersion = "22.11";
}; };
} }
``` ```
@ -80,7 +80,7 @@ To enable `home-manager` you simply need to follow the instructions already prov
1. Add `home-manager` channel: 1. Add `home-manager` channel:
```sh ```sh
nix-channel --add https://github.com/rycee/home-manager/archive/release-22.05.tar.gz home-manager nix-channel --add https://github.com/rycee/home-manager/archive/release-22.11.tar.gz home-manager
nix-channel --update nix-channel --update
``` ```
2. Configure `home-manager`: 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 # Read Nix-on-Droid changelog before changing this value
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# insert Nix-on-Droid config # insert Nix-on-Droid config
@ -97,7 +97,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 = "22.05"; home.stateVersion = "22.11";
# insert home-manager config # 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."; description = "Minimal example of Nix-on-Droid system config.";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nix-on-droid = { nix-on-droid = {
url = "github:t184256/nix-on-droid/release-22.05"; url = "github:t184256/nix-on-droid/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

4
docs/manual.xml
View file

@ -31,10 +31,10 @@
<programlisting language="nix"> <programlisting language="nix">
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nix-on-droid = { nix-on-droid = {
url = "github:t184256/nix-on-droid/release-22.05"; url = "github:t184256/nix-on-droid/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

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

@ -5,8 +5,8 @@
with lib; with lib;
let let
defaultNixpkgsBranch = "nixos-22.05"; defaultNixpkgsBranch = "nixos-22.11";
defaultNixOnDroidBranch = "release-22.05"; defaultNixOnDroidBranch = "release-22.11";
defaultNixpkgsChannel = "https://nixos.org/channels/${defaultNixpkgsBranch}"; defaultNixpkgsChannel = "https://nixos.org/channels/${defaultNixpkgsBranch}";
defaultNixOnDroidChannel = "https://github.com/t184256/nix-on-droid/archive/${defaultNixOnDroidBranch}.tar.gz"; defaultNixOnDroidChannel = "https://github.com/t184256/nix-on-droid/archive/${defaultNixOnDroidBranch}.tar.gz";

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

@ -28,7 +28,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# Set up nix for flakes # Set up nix for flakes
#nix.extraOptions = '' #nix.extraOptions = ''
@ -39,7 +39,7 @@
#time.timeZone = "Europe/Berlin"; #time.timeZone = "Europe/Berlin";
# After installing home-manager channel like # After installing home-manager channel like
# nix-channel --add https://github.com/rycee/home-manager/archive/release-22.05.tar.gz home-manager # nix-channel --add https://github.com/rycee/home-manager/archive/release-22.11.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 = { #home-manager = {
@ -49,7 +49,7 @@
# { config, lib, pkgs, ... }: # { config, lib, pkgs, ... }:
# { # {
# # Read the changelog before changing this value # # Read the changelog before changing this value
# home.stateVersion = "22.05"; # home.stateVersion = "22.11";
# #
# # insert home-manager config # # insert home-manager config
# }; # };

11
modules/version.nix
View file

@ -11,7 +11,16 @@ with lib;
options = { options = {
system.stateVersion = mkOption { system.stateVersion = mkOption {
type = types.enum [ "19.09" "20.03" "20.09" "21.05" "21.11" "22.05" ]; type = types.enum [
"19.09"
"20.03"
"20.09"
"21.05"
"21.11"
"22.05"
"22.11"
"23.05"
];
description = '' description = ''
It is occasionally necessary for Nix-on-Droid to change It is occasionally necessary for Nix-on-Droid to change
configuration defaults in a way that is incompatible with configuration defaults in a way that is incompatible with

2
pkgs/default.nix
View file

@ -35,7 +35,7 @@ let
pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix
}; };
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# Fix invoking bash after initial build. # Fix invoking bash after initial build.
user.shell = "${initialPackageInfo.bash}/bin/bash"; user.shell = "${initialPackageInfo.bash}/bin/bash";

6
templates/advanced/flake.nix
View file

@ -2,15 +2,15 @@
description = "Advanced example of Nix-on-Droid system config with home-manager."; description = "Advanced example of Nix-on-Droid system config with home-manager.";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.05"; url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-on-droid = { nix-on-droid = {
url = "github:t184256/nix-on-droid/release-22.05"; url = "github:t184256/nix-on-droid/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };

2
templates/advanced/home.nix
View file

@ -2,7 +2,7 @@
{ {
# Read the changelog before changing this value # Read the changelog before changing this value
home.stateVersion = "22.05"; home.stateVersion = "22.11";
# insert home-manager config # insert home-manager config
} }

2
templates/advanced/nix-on-droid.nix
View file

@ -28,7 +28,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# Set up nix for flakes # Set up nix for flakes
nix.extraOptions = '' nix.extraOptions = ''

6
templates/home-manager/flake.nix
View file

@ -2,15 +2,15 @@
description = "Minimal example of Nix-on-Droid system config with home-manager."; description = "Minimal example of Nix-on-Droid system config with home-manager.";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.05"; url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-on-droid = { nix-on-droid = {
url = "github:t184256/nix-on-droid/release-22.05"; url = "github:t184256/nix-on-droid/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };

4
templates/home-manager/nix-on-droid.nix
View file

@ -28,7 +28,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# Set up nix for flakes # Set up nix for flakes
nix.extraOptions = '' nix.extraOptions = ''
@ -47,7 +47,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
# Read the changelog before changing this value # Read the changelog before changing this value
home.stateVersion = "22.05"; home.stateVersion = "22.11";
# insert home-manager config # insert home-manager config
}; };

4
templates/minimal/flake.nix
View file

@ -2,10 +2,10 @@
description = "Basic example of Nix-on-Droid system config."; description = "Basic example of Nix-on-Droid system config.";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nix-on-droid = { nix-on-droid = {
url = "github:t184256/nix-on-droid/release-22.05"; url = "github:t184256/nix-on-droid/release-22.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

2
templates/minimal/nix-on-droid.nix
View file

@ -28,7 +28,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# Set up nix for flakes # Set up nix for flakes
nix.extraOptions = '' nix.extraOptions = ''

2
tests/on-device/config-flake-default.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-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
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-flake-h-m.cfg.nix
View file

@ -1,7 +1,7 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.11";
# 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 = "22.05"; home.stateVersion = "22.11";
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-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
home-manager.url = "github:nix-community/home-manager/release-22.05"; home-manager.url = "github:nix-community/home-manager/release-22.11";
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-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
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";
}; };

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

@ -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-22.05.tar.gz home-manager nix-channel --add https://github.com/rycee/home-manager/archive/release-22.11.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 = "22.05"; system.stateVersion = "22.11";
home-manager.config = home-manager.config =
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
home.stateVersion = "22.05"; home.stateVersion = "22.11";
nixpkgs = { inherit (config.nixpkgs) overlays; }; nixpkgs = { inherit (config.nixpkgs) overlays; };
# example config # example config