From 5f3b1440fec98b7e67d35a00da949da407a134ca Mon Sep 17 00:00:00 2001 From: Sergey Volkov Date: Wed, 5 Jun 2024 18:03:25 +0200 Subject: [PATCH] WIP: update inputs and copyrights to 24.05 Co-authored-by: Alexander Sosedkin --- README.md | 14 ++++++------ docs/manual.xml | 4 ++-- flake.lock | 8 +++---- flake.nix | 4 ++-- modules/build/initial-build.nix | 4 ++-- modules/environment/login/default.nix | 2 +- .../login/nix-on-droid.nix.default | 6 ++--- modules/environment/session-init.nix | 2 +- modules/upgrade.nix | 2 +- overlays/lib/nixpkgs.nix | 8 +++---- pkgs/cross-compiling/compiler-rt.patch | 11 +++++----- pkgs/cross-compiling/libunwind.patch | 22 +++++++++---------- pkgs/cross-compiling/talloc-static.nix | 2 +- pkgs/default.nix | 2 +- pkgs/proot-termux/default.nix | 2 +- templates/advanced/flake.nix | 6 ++--- templates/advanced/home.nix | 2 +- templates/advanced/nix-on-droid.nix | 2 +- templates/home-manager/flake.nix | 6 ++--- templates/home-manager/nix-on-droid.nix | 4 ++-- templates/minimal/flake.nix | 4 ++-- templates/minimal/nix-on-droid.nix | 2 +- .../on-device/config-android-integration.nix | 2 +- tests/on-device/config-flake-default.nix | 2 +- tests/on-device/config-flake-h-m.cfg.nix | 4 ++-- tests/on-device/config-flake-h-m.flake.nix | 4 ++-- .../config-flake-hosts-localhost.cfg.nix | 2 +- tests/on-device/config-flake-hosts.cfg.nix | 2 +- tests/on-device/config-flake.nix | 2 +- tests/on-device/config-h-m.bats | 2 +- tests/on-device/config-h-m.nix | 4 ++-- tests/on-device/config-term-colors.nix | 2 +- 32 files changed, 72 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index b8c3659b..714ce58d 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ for example: { environment.packages = [ pkgs.vim ]; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; } ``` @@ -67,7 +67,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key { environment.packages = [ pkgs.vim ]; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; }; } ``` @@ -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-23.11.tar.gz home-manager + nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.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 = "23.11"; + system.stateVersion = "24.05"; # 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 = "23.11"; + home.stateVersion = "24.05"; # 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-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-23.11"; + url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/docs/manual.xml b/docs/manual.xml index 78ccb877..60036cf9 100644 --- a/docs/manual.xml +++ b/docs/manual.xml @@ -31,10 +31,10 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-23.11"; + url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/flake.lock b/flake.lock index 7e25b076..af8c03eb 100644 --- a/flake.lock +++ b/flake.lock @@ -75,17 +75,17 @@ }, "nixpkgs-for-bootstrap": { "locked": { - "lastModified": 1708105575, - "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=", + "lastModified": 1720244366, + "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", "type": "github" } }, diff --git a/flake.nix b/flake.nix index e62d314f..0a596c5a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,9 @@ nixpkgs.url = "github:NixOS/nixpkgs"; # for bootstrap zip ball creation and proot-termux builds, we use a fixed version of nixpkgs to ease maintanence. - # head of nixos-23.11 as of 2024-02-17 + # head of nixos-24.05 as of 2024-07-06 # note: when updating nixpkgs-for-bootstrap, update store paths of proot-termux in modules/environment/login/default.nix - nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/1d1817869c47682a6bee85b5b0a6537b6c0fba26"; + nixpkgs-for-bootstrap.url = "github:NixOS/nixpkgs/49ee0e94463abada1de470c9c07bfc12b36dcf40"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/modules/build/initial-build.nix b/modules/build/initial-build.nix index 79490132..0527b61c 100644 --- a/modules/build/initial-build.nix +++ b/modules/build/initial-build.nix @@ -5,8 +5,8 @@ with lib; let - defaultNixpkgsBranch = "nixos-23.11"; - defaultNixOnDroidBranch = "release-23.11"; + defaultNixpkgsBranch = "nixos-24.05"; + defaultNixOnDroidBranch = "release-24.05"; 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/default.nix b/modules/environment/login/default.nix index c47d2d16..c1a8c280 100644 --- a/modules/environment/login/default.nix +++ b/modules/environment/login/default.nix @@ -87,7 +87,7 @@ in prootStatic = let crossCompiledPaths = { - aarch64-linux = "/nix/store/7w09z1kw62wg7nv3q3z2p6kxf1ihk178-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-11-11"; + aarch64-linux = "/nix/store/phj07a1pg3vwqdhq4cxd1dac4zc28mnc-proot-termux-static-aarch64-unknown-linux-android-unstable-2023-11-11"; x86_64-linux = "/nix/store/i6jppi627sakbgm5x2a8jjdfyv8571zc-proot-termux-static-x86_64-unknown-linux-android-unstable-2023-11-11"; }; in diff --git a/modules/environment/login/nix-on-droid.nix.default b/modules/environment/login/nix-on-droid.nix.default index 4514f30a..ef75baae 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 = "23.11"; + system.stateVersion = "24.05"; # 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-23.11.tar.gz home-manager + # nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.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 = "23.11"; + # home.stateVersion = "24.05"; # # # insert home-manager config # }; diff --git a/modules/environment/session-init.nix b/modules/environment/session-init.nix index 14aa8297..5cabe804 100644 --- a/modules/environment/session-init.nix +++ b/modules/environment/session-init.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, pkgs, ... }: diff --git a/modules/upgrade.nix b/modules/upgrade.nix index 62fe139f..51f289c0 100644 --- a/modules/upgrade.nix +++ b/modules/upgrade.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { config, lib, ... }: diff --git a/overlays/lib/nixpkgs.nix b/overlays/lib/nixpkgs.nix index 21674d43..92117189 100644 --- a/overlays/lib/nixpkgs.nix +++ b/overlays/lib/nixpkgs.nix @@ -1,14 +1,14 @@ -# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { super }: let - # head of nixos-23.11 as of 2024-02-17 + # head of nixos-24.05 as of 2024-07-06 pinnedPkgsSrc = super.fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - rev = "1d1817869c47682a6bee85b5b0a6537b6c0fba26"; - sha256 = "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0="; + rev = "49ee0e94463abada1de470c9c07bfc12b36dcf40"; + sha256 = ""; }; in diff --git a/pkgs/cross-compiling/compiler-rt.patch b/pkgs/cross-compiling/compiler-rt.patch index a7d9d19b..31af4e31 100644 --- a/pkgs/cross-compiling/compiler-rt.patch +++ b/pkgs/cross-compiling/compiler-rt.patch @@ -1,9 +1,8 @@ -diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/d -evelopment/compilers/llvm/16/compiler-rt/default.nix -index 0f15a9e12cde..a32533e5285c 100644 ---- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix -+++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix -@@ -130,8 +130,8 @@ stdenv.mkDerivation { +diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +index 7d47436b714f..d30df471e92a 100644 +--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix ++++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +@@ -155,8 +155,8 @@ stdenv.mkDerivation ({ # The presence of crtbegin_shared has been added and removed; it's possible # people have added/removed it to get it working on their platforms. # Try each in turn for now. diff --git a/pkgs/cross-compiling/libunwind.patch b/pkgs/cross-compiling/libunwind.patch index c1746149..2d510fa6 100644 --- a/pkgs/cross-compiling/libunwind.patch +++ b/pkgs/cross-compiling/libunwind.patch @@ -1,13 +1,13 @@ -diff --git a/pkgs/development/compilers/llvm/16/libunwind/default.nix b/pkgs/development/compilers/llvm/16/libunwind/default.nix -index 1b677a7a2c0d..6c16e869a085 100644 ---- a/pkgs/development/compilers/llvm/16/libunwind/default.nix -+++ b/pkgs/development/compilers/llvm/16/libunwind/default.nix -@@ -49,6 +49,8 @@ stdenv.mkDerivation rec { - - nativeBuildInputs = [ cmake ninja python3 ]; - +diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix +index 515914e6acb6..ca53043bd278 100644 +--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix ++++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix +@@ -67,6 +67,8 @@ stdenv.mkDerivation (rec { + ninja python3 + ]; + + LDFLAGS = "-unwindlib=none"; + - cmakeFlags = [ - "-DLLVM_ENABLE_RUNTIMES=libunwind" - ] ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind" + ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + diff --git a/pkgs/cross-compiling/talloc-static.nix b/pkgs/cross-compiling/talloc-static.nix index d8dff547..ffea6509 100644 --- a/pkgs/cross-compiling/talloc-static.nix +++ b/pkgs/cross-compiling/talloc-static.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { callPackage , fetchurl diff --git a/pkgs/default.nix b/pkgs/default.nix index cafa6023..1840faa9 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 = "23.11"; + system.stateVersion = "24.05"; # 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 06e4b4dd..d3bc0a03 100644 --- a/pkgs/proot-termux/default.nix +++ b/pkgs/proot-termux/default.nix @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE. { stdenv , fetchFromGitHub diff --git a/templates/advanced/flake.nix b/templates/advanced/flake.nix index 24066d5f..26b63e3f 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-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-23.11"; + url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; diff --git a/templates/advanced/home.nix b/templates/advanced/home.nix index 958bf39c..bcd9a86b 100644 --- a/templates/advanced/home.nix +++ b/templates/advanced/home.nix @@ -2,7 +2,7 @@ { # Read the changelog before changing this value - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; # insert home-manager config } diff --git a/templates/advanced/nix-on-droid.nix b/templates/advanced/nix-on-droid.nix index fab9a35c..dea6b3e7 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 = "23.11"; + system.stateVersion = "24.05"; # Set up nix for flakes nix.extraOptions = '' diff --git a/templates/home-manager/flake.nix b/templates/home-manager/flake.nix index 40474c61..1be4dcc7 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-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-23.11"; + url = "github:nix-community/nix-on-droid/release-24.05"; 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 c1706ffa..e4033f37 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 = "23.11"; + system.stateVersion = "24.05"; # Set up nix for flakes nix.extraOptions = '' @@ -49,7 +49,7 @@ { config, lib, pkgs, ... }: { # Read the changelog before changing this value - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; # insert home-manager config }; diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix index fda6a425..ea447050 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-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nix-on-droid = { - url = "github:nix-community/nix-on-droid/release-23.11"; + url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/templates/minimal/nix-on-droid.nix b/templates/minimal/nix-on-droid.nix index c5d50d80..99a63341 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 = "23.11"; + system.stateVersion = "24.05"; # Set up nix for flakes nix.extraOptions = '' diff --git a/tests/on-device/config-android-integration.nix b/tests/on-device/config-android-integration.nix index dd30d5e4..3063d730 100644 --- a/tests/on-device/config-android-integration.nix +++ b/tests/on-device/config-android-integration.nix @@ -1,7 +1,7 @@ _: { - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; 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 a4cffb06..df3dcf1a 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-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; 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 dfc9c4f3..fb729d0a 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 = "23.11"; + system.stateVersion = "24.05"; # no nixpkgs.overlays defined environment.packages = with pkgs; [ zsh ]; @@ -9,7 +9,7 @@ home-manager.config = { pkgs, ... }: { - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; 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 731508b8..606f2a0f 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-23.11"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; 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 157308a5..5b2d06ac 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 = "23.11"; + system.stateVersion = "24.05"; 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 a633fa34..1df64835 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 = "23.11"; + system.stateVersion = "24.05"; 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 4d6a67c1..55c5e14f 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-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; 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 ee168281..e3bb8b0e 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-23.11.tar.gz home-manager + nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.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 be8bd391..31ce19eb 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 = "23.11"; + system.stateVersion = "24.05"; home-manager.config = { pkgs, lib, ... }: { - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; 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 ec3d8f4a..6667b096 100644 --- a/tests/on-device/config-term-colors.nix +++ b/tests/on-device/config-term-colors.nix @@ -1,7 +1,7 @@ _: { - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; terminal.colors = { background = "#FFFFFF"; foreground = "#000000";