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

WIP 22.05

Browse source
This commit is contained in:
Alexander Sosedkin 2022-05-31 12:04:22 +02:00
parent 993cc2abfb
commit a3f92c0e0d
12 changed files with 29 additions and 29 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 ];
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";

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

@ -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.";
};
};

2
modules/environment/login/default.nix
View file

@ -82,7 +82,7 @@ in
environment.files = {
inherit login loginInner;
prootStatic = "/nix/store/dapbgzbpl426jrhz4a2sdl096a8l98ad-proot-termux-aarch64-unknown-linux-android-unstable-2021-11-21";
prootStatic = "/nix/store/fmkdds5jp3ddx8mkb63fshkiiangw4ny-proot-termux-aarch64-unknown-linux-android-unstable-2021-11-21";
};
};

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

@ -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; };

2
modules/version.nix
View file

@ -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

6
overlays/lib/nixpkgs.nix
View file

@ -3,12 +3,12 @@
{ super }:
let
# head of nixos-21.11 as of 2021-12-01
# head of nixos-22.05 as of 2022-05-31
pinnedPkgsSrc = super.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "a640d8394f34714578f3e6335fc767d0755d78f9";
sha256 = "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj";
rev = "a634c8f6c1fbf9b9730e01764999666f3436f10a";
sha256 = "1d40v43x972li5fg7jadxkj341li41mf2cl6vv7xi6j80rkq45q4";
};
in

6
pkgs/lib/load-nixpkgs.nix
View file

@ -6,11 +6,11 @@ let
overlays = [ ];
};
# head of nixos-21.11 as of 2021-12-01
# head of nixos-22.05 as of 2022-05-31
# note: when updating nixpkgs, update store paths of proot-termux in modules/environment/login/default.nix
pinnedPkgsSrc = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/a640d8394f34714578f3e6335fc767d0755d78f9.tar.gz";
sha256 = "1dyyzgcmlhpsdb4ngiy8m0x10qmh0r56ky75r8ppvvh730m3lhfj";
url = "https://github.com/NixOS/nixpkgs/archive/a634c8f6c1fbf9b9730e01764999666f3436f10a.tar.gz";
sha256 = "1d40v43x972li5fg7jadxkj341li41mf2cl6vv7xi6j80rkq45q4";
};
in

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

@ -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 ];

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

@ -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 = "<<FLAKE_URL>>";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
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";
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.inputs.nixpkgs.follows = "nixpkgs";
};

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

@ -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

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

@ -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