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 to 24.11

Browse source
This commit is contained in:
Marlin Cremers 2024-12-29 10:16:30 +00:00 • committed by Marlin Cremers
parent 5d88ff2519
commit 782afbd28d
26 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -53,7 +53,7 @@ for example:
{ {
environment.packages = [ pkgs.vim ]; environment.packages = [ pkgs.vim ];
system.stateVersion = "24.05"; system.stateVersion = "24.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 = "24.05"; system.stateVersion = "24.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/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 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 = "24.05"; system.stateVersion = "24.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 = "24.05"; home.stateVersion = "24.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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nix-on-droid = { 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.nixpkgs.follows = "nixpkgs";
}; };
}; };

2
docs/default.nix
View file

@ -11,7 +11,7 @@ let
_module.args.pkgs = pkgs.lib.mkForce (nmd.scrubDerivations "pkgs" pkgs); _module.args.pkgs = pkgs.lib.mkForce (nmd.scrubDerivations "pkgs" pkgs);
system.stateVersion = "19.09"; system.stateVersion = "19.09";
home-manager.sharedModules = [ (_: { home.stateVersion = "24.05"; }) ]; home-manager.sharedModules = [ (_: { home.stateVersion = "24.11"; }) ];
}; };
modules = import ../modules/module-list.nix { modules = import ../modules/module-list.nix {

4
docs/manual.xml
View file

@ -31,10 +31,10 @@
<programlisting language="nix"> <programlisting language="nix">
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nix-on-droid = { 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.nixpkgs.follows = "nixpkgs";
}; };
}; };

18
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709445365, "lastModified": 1735381016,
"narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -31,11 +31,11 @@
"nmt": "nmt" "nmt": "nmt"
}, },
"locked": { "locked": {
"lastModified": 1705252799, "lastModified": 1734904675,
"narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=",
"owner": "Gerschtli", "owner": "Gerschtli",
"repo": "nix-formatter-pack", "repo": "nix-formatter-pack",
"rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,11 +46,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708172716, "lastModified": 1735466872,
"narHash": "sha256-3M94oln0b61m3dUmLyECCA9hYAHXZEszM4saE3CmQO4=", "narHash": "sha256-aGGxtBOJVzoNhfxtlbclUQxs8glF5irYvlE5FTXDR98=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5d874ac46894c896119bce68e758e9e80bdb28f1", "rev": "a9682496461b2576d6d5cc45a3e9ec1bb0e04c08",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

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

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

@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "24.05"; system.stateVersion = "24.11";
# Set up nix for flakes # Set up nix for flakes
#nix.extraOptions = '' #nix.extraOptions = ''
@ -41,7 +41,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/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 # nix-channel --update
# you can configure home-manager in here like # you can configure home-manager in here like
#home-manager = { #home-manager = {
@ -51,7 +51,7 @@
# { config, lib, pkgs, ... }: # { config, lib, pkgs, ... }:
# { # {
# # Read the changelog before changing this value # # Read the changelog before changing this value
# home.stateVersion = "24.05"; # home.stateVersion = "24.11";
# #
# # insert home-manager config # # insert home-manager config
# }; # };

1
modules/version.nix
View file

@ -22,6 +22,7 @@ with lib;
"23.05" "23.05"
"23.11" "23.11"
"24.05" "24.05"
"24.11"
]; ];
description = '' description = ''
It is occasionally necessary for Nix-on-Droid to change It is occasionally necessary for Nix-on-Droid to change

2
pkgs/default.nix
View file

@ -37,7 +37,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 = "24.05"; system.stateVersion = "24.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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-on-droid = { 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.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 = "24.05"; home.stateVersion = "24.11";
# insert home-manager config # insert home-manager config
} }

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

@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "24.05"; system.stateVersion = "24.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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-on-droid = { 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.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

@ -30,7 +30,7 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "24.05"; system.stateVersion = "24.11";
# Set up nix for flakes # Set up nix for flakes
nix.extraOptions = '' nix.extraOptions = ''
@ -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 = "24.05"; home.stateVersion = "24.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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nix-on-droid = { 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.nixpkgs.follows = "nixpkgs";
}; };
}; };

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

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

2
tests/emulator/poke_around.py
View file

@ -57,7 +57,7 @@ def run(d):
import base64 import base64
import time import time
config = ('{pkgs, ...}: {user.shell = %SHELL%; ' + 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() config_base64 = base64.b64encode(config.encode()).decode()
d(f'input text "echo {config_base64} | base64 -d > ' d(f'input text "echo {config_base64} | base64 -d > '
'~/.config/nixpkgs/nix-on-droid.nix"') '~/.config/nixpkgs/nix-on-droid.nix"')

2
tests/on-device/config-android-integration.nix
View file

@ -1,7 +1,7 @@
_: _:
{ {
system.stateVersion = "24.05"; system.stateVersion = "24.11";
android-integration = { android-integration = {
am.enable = true; am.enable = true;
termux-open.enable = true; termux-open.enable = true;

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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.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 = "24.05"; system.stateVersion = "24.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 = "24.05"; home.stateVersion = "24.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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.11";
nix-on-droid = { nix-on-droid = {
url = "<<FLAKE_URL>>"; url = "<<FLAKE_URL>>";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

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

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
system.stateVersion = "24.05"; system.stateVersion = "24.11";
networking.hosts."127.0.0.2" = [ "localhost" ]; networking.hosts."127.0.0.2" = [ "localhost" ];
} }

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

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
system.stateVersion = "24.05"; system.stateVersion = "24.11";
networking = { networking = {
hosts."127.0.0.2" = [ "a" "b" ]; hosts."127.0.0.2" = [ "a" "b" ];

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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.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/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 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 = "24.05"; system.stateVersion = "24.11";
home-manager.config = home-manager.config =
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
home.stateVersion = "24.05"; home.stateVersion = "24.11";
nixpkgs = { inherit (config.nixpkgs) overlays; }; nixpkgs = { inherit (config.nixpkgs) overlays; };
# example config # example config

2
tests/on-device/config-term-colors.nix
View file

@ -1,7 +1,7 @@
_: _:
{ {
system.stateVersion = "24.05"; system.stateVersion = "24.11";
terminal.colors = { terminal.colors = {
background = "#FFFFFF"; background = "#FFFFFF";
foreground = "#000000"; foreground = "#000000";