update to 24.11

nix-community · Dec 29, 2024 · 5b465d0 · 5b465d0
1 parent 5d88ff2
commit 5b465d0
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 44 deletions.
diff --git 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,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
         };
@@ -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
@@ -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
@@ -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";
     };
   };

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

diff --git a/tests/on-device/config-flake-h-m.cfg.nix b/tests/on-device/config-flake-h-m.cfg.nix
@@ -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 ];

diff --git 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 = "<<FLAKE_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
@@ -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
@@ -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
@@ -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";
   };

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 _:
 
 {
-  system.stateVersion = "24.05";
+  system.stateVersion = "24.11";
   terminal.colors = {
     background = "#FFFFFF";
     foreground = "#000000";
-Original file 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 @@