pkgs/nix-directory: update nix to 2.23.2

nix-community · Jul 7, 2024 · ec0fdda · ec0fdda
1 parent af0e60a
commit ec0fdda
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkgs/nix-directory.nix b/pkgs/nix-directory.nix
@@ -32,12 +32,12 @@ stdenvNoCC.mkDerivation {
   name = "nix-directory";
 
   src = builtins.fetchurl {
-    url = "https://nixos.org/releases/nix/nix-2.20.5/nix-2.20.5-${system}.tar.xz";
+    url = "https://nixos.org/releases/nix/nix-2.23.2/nix-2.23.2-${system}.tar.xz";
     sha256 =
       let
         nixShas = {
-          aarch64-linux = "sha256:168wjfj3xsc8hq1y6cq59iipjp1g9hmj4n5wdn9c47ad9gbc9cvh";
-          x86_64-linux = "sha256:0dax9n562ldj53ap6lz0cwwsfx4d8j1267g9s6lg3zs237yyzw61";
+          aarch64-linux = "sha256:137m0c2px4lwirmm2zx2m1h6rjyl0db32j7fjdfzhhviy5dr8cwq";
+          x86_64-linux = "sha256:0irx2hl1irhw2xjq6h74jyqgm6sjdw7jxa4hyab2304174j368h7";
         };
       in
       nixShas.${system};

diff --git a/tests/emulator/bootstrap_channels.py b/tests/emulator/bootstrap_channels.py
@@ -39,7 +39,7 @@ def run(d):
     wait_for(d, 'Setting up Nix-on-Droid with channels...')
 
     wait_for(d, 'Installing and updating nix-channels...')
-    wait_for(d, 'unpacking channels...')
+    wait_for(d, 'unpacking 1 channels...')
     wait_for(d, 'Installing first Nix-on-Droid generation...', timeout=600)
     wait_for(d, 'Copying default Nix-on-Droid config...', timeout=180)
     wait_for(d, 'Congratulations!')

diff --git a/tests/emulator/bootstrap_flakes.py b/tests/emulator/bootstrap_flakes.py
@@ -40,8 +40,9 @@ def run(d):
     wait_for(d, 'Setting up Nix-on-Droid with flakes...')
 
     wait_for(d, 'Installing flake from default template...')
+    wait_for(d, 'Overriding input urls in the flake...')
     wait_for(d, 'Overriding system value in the flake...', timeout=600)
-    wait_for(d, 'Installing first Nix-on-Droid generation...')
+    wait_for(d, 'Installing first Nix-on-Droid generation...', timeout=600)
     wait_for(d, 'Building activation package', timeout=180)
     wait_for(d, 'Congratulations!', timeout=900)
     wait_for(d, 'bash-5.2$')