Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to 24.11 #432

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

update to 24.11 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4694296
update to 24.11
Dec 29, 2024
78f3787
test: increase emulator disk size
Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/emulator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-${{ matrix.api-level }}
key: avd-test-${{ matrix.api-level }}

- name: Enable KVM
if: matrix.api-level == 29 && steps.avd-cache.outputs.cache-hit != 'true'
Expand All @@ -91,6 +91,7 @@ jobs:
target: default
arch: x86_64
api-level: ${{ matrix.api-level }}
disk-size: 8G
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: false
Expand Down Expand Up @@ -155,14 +156,15 @@ jobs:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-${{ matrix.api-level }}
key: avd-test-${{ matrix.api-level }}

- name: Test script=${{ matrix.script }} api-level=${{ matrix.api-level }}
uses: reactivecircus/android-emulator-runner@v2
with:
target: default
arch: x86_64
api-level: ${{ matrix.api-level }}
disk-size: 8G
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ for example:

{
environment.packages = [ pkgs.vim ];
system.stateVersion = "24.05";
system.stateVersion = "24.11";
}
```

Expand All @@ -67,7 +67,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key

{
environment.packages = [ pkgs.vim ];
system.stateVersion = "24.05";
system.stateVersion = "24.11";
};
}
```
Expand All @@ -80,7 +80,7 @@ To enable `home-manager` you simply need to follow the instructions already prov

1. Add `home-manager` channel:
```sh
nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
nix-channel --update
```
2. Configure `home-manager`:
Expand All @@ -89,15 +89,15 @@ To enable `home-manager` you simply need to follow the instructions already prov

{
# Read Nix-on-Droid changelog before changing this value
system.stateVersion = "24.05";
system.stateVersion = "24.11";

# insert Nix-on-Droid config

home-manager.config =
{ pkgs, ... }:
{
# Read home-manager changelog before changing this value
home.stateVersion = "24.05";
home.stateVersion = "24.11";

# insert home-manager config
};
Expand Down Expand Up @@ -181,10 +181,10 @@ A minimal example could look like the following:
description = "Minimal example of Nix-on-Droid system config.";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";

nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05";
url = "github:nix-community/nix-on-droid/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};
Expand Down
2 changes: 1 addition & 1 deletion docs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
_module.args.pkgs = pkgs.lib.mkForce (nmd.scrubDerivations "pkgs" pkgs);

system.stateVersion = "19.09";
home-manager.sharedModules = [ (_: { home.stateVersion = "24.05"; }) ];
home-manager.sharedModules = [ (_: { home.stateVersion = "24.11"; }) ];
};

modules = import ../modules/module-list.nix {
Expand Down
4 changes: 2 additions & 2 deletions docs/manual.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<programlisting language="nix">
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";

nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05";
url = "github:nix-community/nix-on-droid/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};
Expand Down
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions modules/build/initial-build.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
with lib;

let
defaultNixpkgsBranch = "nixos-24.05";
defaultNixOnDroidBranch = "release-24.05";
defaultNixpkgsBranch = "nixos-24.11";
defaultNixOnDroidBranch = "release-24.11";

defaultNixpkgsChannel = "https://nixos.org/channels/${defaultNixpkgsBranch}";
defaultNixOnDroidChannel = "https://github.com/nix-community/nix-on-droid/archive/${defaultNixOnDroidBranch}.tar.gz";
Expand Down
6 changes: 3 additions & 3 deletions modules/environment/login/nix-on-droid.nix.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak";

# Read the changelog before changing this value
system.stateVersion = "24.05";
system.stateVersion = "24.11";

# Set up nix for flakes
#nix.extraOptions = ''
Expand All @@ -41,7 +41,7 @@
#time.timeZone = "Europe/Berlin";

# After installing home-manager channel like
# nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
# nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager
# nix-channel --update
# you can configure home-manager in here like
#home-manager = {
Expand All @@ -51,7 +51,7 @@
# { config, lib, pkgs, ... }:
# {
# # Read the changelog before changing this value
# home.stateVersion = "24.05";
# home.stateVersion = "24.11";
#
# # insert home-manager config
# };
Expand Down
1 change: 1 addition & 0 deletions modules/version.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ with lib;
"23.05"
"23.11"
"24.05"
"24.11"
];
description = ''
It is occasionally necessary for Nix-on-Droid to change
Expand Down
2 changes: 1 addition & 1 deletion pkgs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let
pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix
};

system.stateVersion = "24.05";
system.stateVersion = "24.11";

# Fix invoking bash after initial build.
user.shell = "${initialPackageInfo.bash}/bin/bash";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/proot-termux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

stdenv.mkDerivation {
pname = "proot-termux";
version = "unstable-2024-05-04";
version = "unstable-2024.11-04";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks like an error


src = fetchFromGitHub {
repo = "proot";
Expand Down
6 changes: 3 additions & 3 deletions templates/advanced/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
description = "Advanced example of Nix-on-Droid system config with home-manager.";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";

home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};

nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05";
url = "github:nix-community/nix-on-droid/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
Expand Down
2 changes: 1 addition & 1 deletion templates/advanced/home.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{
# Read the changelog before changing this value
home.stateVersion = "24.05";
home.stateVersion = "24.11";

# insert home-manager config
}
2 changes: 1 addition & 1 deletion templates/advanced/nix-on-droid.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak";

# Read the changelog before changing this value
system.stateVersion = "24.05";
system.stateVersion = "24.11";

# Set up nix for flakes
nix.extraOptions = ''
Expand Down
6 changes: 3 additions & 3 deletions templates/home-manager/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
description = "Minimal example of Nix-on-Droid system config with home-manager.";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";

home-manager = {
url = "github:nix-community/home-manager/release-24.05";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};

nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05";
url = "github:nix-community/nix-on-droid/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
Expand Down
4 changes: 2 additions & 2 deletions templates/home-manager/nix-on-droid.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak";

# Read the changelog before changing this value
system.stateVersion = "24.05";
system.stateVersion = "24.11";

# Set up nix for flakes
nix.extraOptions = ''
Expand All @@ -49,7 +49,7 @@
{ config, lib, pkgs, ... }:
{
# Read the changelog before changing this value
home.stateVersion = "24.05";
home.stateVersion = "24.11";

# insert home-manager config
};
Expand Down
4 changes: 2 additions & 2 deletions templates/minimal/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
description = "Basic example of Nix-on-Droid system config.";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";

nix-on-droid = {
url = "github:nix-community/nix-on-droid/release-24.05";
url = "github:nix-community/nix-on-droid/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};
Expand Down
2 changes: 1 addition & 1 deletion templates/minimal/nix-on-droid.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak";

# Read the changelog before changing this value
system.stateVersion = "24.05";
system.stateVersion = "24.11";

# Set up nix for flakes
nix.extraOptions = ''
Expand Down
2 changes: 1 addition & 1 deletion tests/emulator/poke_around.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def change_shell_and_relogin(shell, descr):
import base64
import time
config = ('{pkgs, ...}: {user.shell = %SHELL%; ' +
'system.stateVersion = "24.05";}').replace('%SHELL%', shell)
'system.stateVersion = "24.11";}').replace('%SHELL%', shell)
config_base64 = base64.b64encode(config.encode()).decode()
d(f'input text "echo {config_base64} | base64 -d > '
'~/.config/nixpkgs/nix-on-droid.nix"')
Expand Down
2 changes: 1 addition & 1 deletion tests/on-device/config-android-integration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_:

{
system.stateVersion = "24.05";
system.stateVersion = "24.11";
android-integration = {
am.enable = true;
termux-open.enable = true;
Expand Down
2 changes: 1 addition & 1 deletion tests/on-device/config-flake-default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Nix-on-Droid configuration";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
nix-on-droid.url = "<<FLAKE_URL>>";
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
};
Expand Down
4 changes: 2 additions & 2 deletions tests/on-device/config-flake-h-m.cfg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ pkgs, config, ... }:

{
system.stateVersion = "24.05";
system.stateVersion = "24.11";

# no nixpkgs.overlays defined
environment.packages = with pkgs; [ zsh ];

home-manager.config =
{ pkgs, ... }:
{
home.stateVersion = "24.05";
home.stateVersion = "24.11";

nixpkgs.overlays = config.nixpkgs.overlays;
home.packages = with pkgs; [ dash ];
Expand Down
4 changes: 2 additions & 2 deletions tests/on-device/config-flake-h-m.flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
description = "Nix-on-Droid configuration";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
home-manager.url = "github:nix-community/home-manager/release-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
home-manager.url = "github:nix-community/home-manager/release-24.11";
nix-on-droid = {
url = "<<FLAKE_URL>>";
inputs.nixpkgs.follows = "nixpkgs";
Expand Down
2 changes: 1 addition & 1 deletion tests/on-device/config-flake-hosts-localhost.cfg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pkgs, ... }:

{
system.stateVersion = "24.05";
system.stateVersion = "24.11";

networking.hosts."127.0.0.2" = [ "localhost" ];
}
2 changes: 1 addition & 1 deletion tests/on-device/config-flake-hosts.cfg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pkgs, ... }:

{
system.stateVersion = "24.05";
system.stateVersion = "24.11";

networking = {
hosts."127.0.0.2" = [ "a" "b" ];
Expand Down
Loading
Loading