diff --git a/README.md b/README.md index ad5ca88e..fc5cb94b 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ for example: { 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 ]; - 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: ```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`: @@ -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 - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; # insert Nix-on-Droid config @@ -97,7 +97,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 = "24.05"; + home.stateVersion = "24.11"; # 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."; 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"; }; }; diff --git a/docs/default.nix b/docs/default.nix index 980e96bf..70e80c8d 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -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 { diff --git a/docs/manual.xml b/docs/manual.xml index 60036cf9..6b2093d3 100644 --- a/docs/manual.xml +++ b/docs/manual.xml @@ -31,10 +31,10 @@ { 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"; }; }; diff --git a/flake.lock b/flake.lock index 888acaed..a06c4f6f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", + "lastModified": 1734904675, + "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", + "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b", "type": "github" }, "original": { @@ -46,11 +46,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708172716, - "narHash": "sha256-3M94oln0b61m3dUmLyECCA9hYAHXZEszM4saE3CmQO4=", + "lastModified": 1735466872, + "narHash": "sha256-aGGxtBOJVzoNhfxtlbclUQxs8glF5irYvlE5FTXDR98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d874ac46894c896119bce68e758e9e80bdb28f1", + "rev": "a9682496461b2576d6d5cc45a3e9ec1bb0e04c08", "type": "github" }, "original": { diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix index 0527b61c..84d24f1f 100644 --- a/modules/build/initial-build.nix +++ b/modules/build/initial-build.nix @@ -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"; diff --git a/modules/environment/login/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default index ef75baae..4bdb6673 100644 --- a/modules/environment/login/nix-on-droid.nix.default +++ b/modules/environment/login/nix-on-droid.nix.default @@ -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 = '' @@ -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 = { @@ -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 # }; diff --git a/modules/version.nix b/modules/version.nix index 980204d0..6bef6df7 100644 --- a/modules/version.nix +++ b/modules/version.nix @@ -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 diff --git a/pkgs/default.nix b/pkgs/default.nix index 1840faa9..fcba74ab 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -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"; diff --git a/pkgs/proot-termux/default.nix b/pkgs/proot-termux/default.nix index 5da9492a..c1bb9e5c 100644 --- a/pkgs/proot-termux/default.nix +++ b/pkgs/proot-termux/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "proot-termux"; - version = "unstable-2024-05-04"; + version = "unstable-2024.11-04"; src = fetchFromGitHub { repo = "proot"; diff --git a/templates/advanced/flake.nix b/templates/advanced/flake.nix index 26b63e3f..ad47aa36 100644 --- a/templates/advanced/flake.nix +++ b/templates/advanced/flake.nix @@ -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"; }; diff --git a/templates/advanced/home.nix b/templates/advanced/home.nix index bcd9a86b..1b60d7fd 100644 --- a/templates/advanced/home.nix +++ b/templates/advanced/home.nix @@ -2,7 +2,7 @@ { # Read the changelog before changing this value - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; # insert home-manager config } diff --git a/templates/advanced/nix-on-droid.nix b/templates/advanced/nix-on-droid.nix index dea6b3e7..ebe0d27c 100644 --- a/templates/advanced/nix-on-droid.nix +++ b/templates/advanced/nix-on-droid.nix @@ -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 = '' diff --git a/templates/home-manager/flake.nix b/templates/home-manager/flake.nix index 1be4dcc7..a19bf3bd 100644 --- a/templates/home-manager/flake.nix +++ b/templates/home-manager/flake.nix @@ -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"; }; diff --git a/templates/home-manager/nix-on-droid.nix b/templates/home-manager/nix-on-droid.nix index e4033f37..00e4314e 100644 --- a/templates/home-manager/nix-on-droid.nix +++ b/templates/home-manager/nix-on-droid.nix @@ -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 = '' @@ -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 }; diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix index ea447050..a7a38b29 100644 --- a/templates/minimal/flake.nix +++ b/templates/minimal/flake.nix @@ -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"; }; }; diff --git a/templates/minimal/nix-on-droid.nix b/templates/minimal/nix-on-droid.nix index 99a63341..fd35e8dc 100644 --- a/templates/minimal/nix-on-droid.nix +++ b/templates/minimal/nix-on-droid.nix @@ -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 = '' diff --git a/tests/emulator/poke_around.py b/tests/emulator/poke_around.py index 8df33a2b..45b036d5 100644 --- a/tests/emulator/poke_around.py +++ b/tests/emulator/poke_around.py @@ -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"') diff --git a/tests/on-device/config-android-integration.nix b/tests/on-device/config-android-integration.nix index 3063d730..8f66aa52 100644 --- a/tests/on-device/config-android-integration.nix +++ b/tests/on-device/config-android-integration.nix @@ -1,7 +1,7 @@ _: { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; android-integration = { am.enable = true; termux-open.enable = true; diff --git a/tests/on-device/config-flake-default.nix b/tests/on-device/config-flake-default.nix index df3dcf1a..06a065c5 100644 --- a/tests/on-device/config-flake-default.nix +++ b/tests/on-device/config-flake-default.nix @@ -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 = "<>"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/tests/on-device/config-flake-h-m.cfg.nix b/tests/on-device/config-flake-h-m.cfg.nix index fb729d0a..7f4a10eb 100644 --- a/tests/on-device/config-flake-h-m.cfg.nix +++ b/tests/on-device/config-flake-h-m.cfg.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; # no nixpkgs.overlays defined environment.packages = with pkgs; [ zsh ]; @@ -9,7 +9,7 @@ home-manager.config = { pkgs, ... }: { - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; nixpkgs.overlays = config.nixpkgs.overlays; home.packages = with pkgs; [ dash ]; diff --git a/tests/on-device/config-flake-h-m.flake.nix b/tests/on-device/config-flake-h-m.flake.nix index 606f2a0f..88c74ed3 100644 --- a/tests/on-device/config-flake-h-m.flake.nix +++ b/tests/on-device/config-flake-h-m.flake.nix @@ -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 = "<>"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/tests/on-device/config-flake-hosts-localhost.cfg.nix b/tests/on-device/config-flake-hosts-localhost.cfg.nix index 5b2d06ac..14362904 100644 --- a/tests/on-device/config-flake-hosts-localhost.cfg.nix +++ b/tests/on-device/config-flake-hosts-localhost.cfg.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; networking.hosts."127.0.0.2" = [ "localhost" ]; } diff --git a/tests/on-device/config-flake-hosts.cfg.nix b/tests/on-device/config-flake-hosts.cfg.nix index 1df64835..030a0b2e 100644 --- a/tests/on-device/config-flake-hosts.cfg.nix +++ b/tests/on-device/config-flake-hosts.cfg.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; networking = { hosts."127.0.0.2" = [ "a" "b" ]; diff --git a/tests/on-device/config-flake.nix b/tests/on-device/config-flake.nix index 55c5e14f..a40278a1 100644 --- a/tests/on-device/config-flake.nix +++ b/tests/on-device/config-flake.nix @@ -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 = "<>"; nix-on-droid.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/tests/on-device/config-h-m.bats b/tests/on-device/config-h-m.bats index e3bb8b0e..78b71697 100644 --- a/tests/on-device/config-h-m.bats +++ b/tests/on-device/config-h-m.bats @@ -21,7 +21,7 @@ teardown() { [[ ! -e ~/.config/example ]] # 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 cp "$ON_DEVICE_TESTS_DIR/config-h-m.nix" ~/.config/nixpkgs/nix-on-droid.nix nix-on-droid switch diff --git a/tests/on-device/config-h-m.nix b/tests/on-device/config-h-m.nix index 31ce19eb..b70d2656 100644 --- a/tests/on-device/config-h-m.nix +++ b/tests/on-device/config-h-m.nix @@ -1,12 +1,12 @@ { pkgs, config, ... }: { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; home-manager.config = { pkgs, lib, ... }: { - home.stateVersion = "24.05"; + home.stateVersion = "24.11"; nixpkgs = { inherit (config.nixpkgs) overlays; }; # example config diff --git a/tests/on-device/config-term-colors.nix b/tests/on-device/config-term-colors.nix index 6667b096..bfe25da8 100644 --- a/tests/on-device/config-term-colors.nix +++ b/tests/on-device/config-term-colors.nix @@ -1,7 +1,7 @@ _: { - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; terminal.colors = { background = "#FFFFFF"; foreground = "#000000";