mirror of
https://github.com/nix-community/nix-on-droid.git
synced 2025-11-08 19:46:07 +01:00
update inputs and copyrights to 24.05
Co-authored-by: Alexander Sosedkin <monk@unboiled.info>
This commit is contained in:
parent
e0216d3e47
commit
91f353edb0
33 changed files with 77 additions and 74 deletions
4
.github/workflows/emulator.yml
vendored
4
.github/workflows/emulator.yml
vendored
|
|
@ -31,6 +31,10 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Install Nix
|
- name: Install Nix
|
||||||
uses: DeterminateSystems/nix-installer-action@main
|
uses: DeterminateSystems/nix-installer-action@main
|
||||||
|
- name: Setup cachix
|
||||||
|
uses: cachix/cachix-action@v14
|
||||||
|
with:
|
||||||
|
name: nix-on-droid
|
||||||
- name: Configure Nix magic cache
|
- name: Configure Nix magic cache
|
||||||
uses: DeterminateSystems/magic-nix-cache-action@main
|
uses: DeterminateSystems/magic-nix-cache-action@main
|
||||||
|
|
||||||
|
|
|
||||||
14
README.md
14
README.md
|
|
@ -53,7 +53,7 @@ for example:
|
||||||
|
|
||||||
{
|
{
|
||||||
environment.packages = [ pkgs.vim ];
|
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 ];
|
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:
|
1. Add `home-manager` channel:
|
||||||
```sh
|
```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
|
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 = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# 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 = "23.11";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
# 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-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
|
|
||||||
nix-on-droid = {
|
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.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -31,10 +31,10 @@
|
||||||
<programlisting language="nix">
|
<programlisting language="nix">
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
|
|
||||||
nix-on-droid = {
|
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.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -75,17 +75,17 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-for-bootstrap": {
|
"nixpkgs-for-bootstrap": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708105575,
|
"lastModified": 1720244366,
|
||||||
"narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",
|
"narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
|
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
|
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs";
|
nixpkgs.url = "github:NixOS/nixpkgs";
|
||||||
|
|
||||||
# for bootstrap zip ball creation and proot-termux builds, we use a fixed version of nixpkgs to ease maintanence.
|
# 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
|
# 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 = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
defaultNixpkgsBranch = "nixos-23.11";
|
defaultNixpkgsBranch = "nixos-24.05";
|
||||||
defaultNixOnDroidBranch = "release-23.11";
|
defaultNixOnDroidBranch = "release-24.05";
|
||||||
|
|
||||||
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";
|
||||||
|
|
|
||||||
|
|
@ -87,8 +87,8 @@ in
|
||||||
prootStatic =
|
prootStatic =
|
||||||
let
|
let
|
||||||
crossCompiledPaths = {
|
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";
|
x86_64-linux = "/nix/store/kg1bfwprdlf28fqd7ml86fywshkvcbhl-proot-termux-static-x86_64-unknown-linux-android-unstable-2023-11-11";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
"${crossCompiledPaths.${targetSystem}}";
|
"${crossCompiledPaths.${targetSystem}}";
|
||||||
|
|
|
||||||
|
|
@ -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 = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# 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-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
|
# 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 = "23.11";
|
# home.stateVersion = "24.05";
|
||||||
#
|
#
|
||||||
# # insert home-manager config
|
# # insert home-manager config
|
||||||
# };
|
# };
|
||||||
|
|
|
||||||
|
|
@ -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, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 }:
|
{ super }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# head of nixos-23.11 as of 2024-02-17
|
# head of nixos-24.05 as of 2024-07-06
|
||||||
pinnedPkgsSrc = super.fetchFromGitHub {
|
pinnedPkgsSrc = super.fetchFromGitHub {
|
||||||
owner = "NixOS";
|
owner = "NixOS";
|
||||||
repo = "nixpkgs";
|
repo = "nixpkgs";
|
||||||
rev = "1d1817869c47682a6bee85b5b0a6537b6c0fba26";
|
rev = "49ee0e94463abada1de470c9c07bfc12b36dcf40";
|
||||||
sha256 = "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=";
|
sha256 = "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/d
|
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
|
||||||
evelopment/compilers/llvm/16/compiler-rt/default.nix
|
index 7d47436b714f..d30df471e92a 100644
|
||||||
index 0f15a9e12cde..a32533e5285c 100644
|
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
|
||||||
--- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
|
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
|
||||||
+++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
|
@@ -155,8 +155,8 @@ stdenv.mkDerivation ({
|
||||||
@@ -130,8 +130,8 @@ stdenv.mkDerivation {
|
|
||||||
# The presence of crtbegin_shared has been added and removed; it's possible
|
# 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.
|
# people have added/removed it to get it working on their platforms.
|
||||||
# Try each in turn for now.
|
# Try each in turn for now.
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
diff --git a/pkgs/development/compilers/llvm/16/libunwind/default.nix b/pkgs/development/compilers/llvm/16/libunwind/default.nix
|
diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
|
||||||
index 1b677a7a2c0d..6c16e869a085 100644
|
index 515914e6acb6..ca53043bd278 100644
|
||||||
--- a/pkgs/development/compilers/llvm/16/libunwind/default.nix
|
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
|
||||||
+++ b/pkgs/development/compilers/llvm/16/libunwind/default.nix
|
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
|
||||||
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
|
@@ -67,6 +67,8 @@ stdenv.mkDerivation (rec {
|
||||||
|
ninja python3
|
||||||
nativeBuildInputs = [ cmake ninja python3 ];
|
];
|
||||||
|
|
||||||
+ LDFLAGS = "-unwindlib=none";
|
+ LDFLAGS = "-unwindlib=none";
|
||||||
+
|
+
|
||||||
cmakeFlags = [
|
cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind"
|
||||||
"-DLLVM_ENABLE_RUNTIMES=libunwind"
|
++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
|
||||||
] ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
{ callPackage
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
|
|
||||||
|
|
@ -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 = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# Fix invoking bash after initial build.
|
# Fix invoking bash after initial build.
|
||||||
user.shell = "${initialPackageInfo.bash}/bin/bash";
|
user.shell = "${initialPackageInfo.bash}/bin/bash";
|
||||||
|
|
|
||||||
|
|
@ -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
|
{ stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
|
|
||||||
|
|
@ -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-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-23.11";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-on-droid = {
|
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.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
# Read the changelog before changing this value
|
# Read the changelog before changing this value
|
||||||
home.stateVersion = "23.11";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
# insert home-manager config
|
# insert home-manager config
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# Set up nix for flakes
|
# Set up nix for flakes
|
||||||
nix.extraOptions = ''
|
nix.extraOptions = ''
|
||||||
|
|
|
||||||
|
|
@ -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-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-23.11";
|
url = "github:nix-community/home-manager/release-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-on-droid = {
|
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.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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 = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# 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 = "23.11";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
# insert home-manager config
|
# insert home-manager config
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||||
|
|
||||||
nix-on-droid = {
|
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.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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 = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# Set up nix for flakes
|
# Set up nix for flakes
|
||||||
nix.extraOptions = ''
|
nix.extraOptions = ''
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
_:
|
_:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "24.05";
|
||||||
android-integration = {
|
android-integration = {
|
||||||
am.enable = true;
|
am.enable = true;
|
||||||
termux-open.enable = true;
|
termux-open.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
description = "Nix-on-Droid configuration";
|
description = "Nix-on-Droid configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
# 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 = "23.11";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
nixpkgs.overlays = config.nixpkgs.overlays;
|
nixpkgs.overlays = config.nixpkgs.overlays;
|
||||||
home.packages = with pkgs; [ dash ];
|
home.packages = with pkgs; [ dash ];
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
description = "Nix-on-Droid configuration";
|
description = "Nix-on-Droid configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||||
nix-on-droid = {
|
nix-on-droid = {
|
||||||
url = "<<FLAKE_URL>>";
|
url = "<<FLAKE_URL>>";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
networking.hosts."127.0.0.2" = [ "localhost" ];
|
networking.hosts."127.0.0.2" = [ "localhost" ];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hosts."127.0.0.2" = [ "a" "b" ];
|
hosts."127.0.0.2" = [ "a" "b" ];
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
description = "Nix-on-Droid configuration";
|
description = "Nix-on-Droid configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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-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
|
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
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "24.05";
|
||||||
|
|
||||||
home-manager.config =
|
home-manager.config =
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
home.stateVersion = "23.11";
|
home.stateVersion = "24.05";
|
||||||
nixpkgs = { inherit (config.nixpkgs) overlays; };
|
nixpkgs = { inherit (config.nixpkgs) overlays; };
|
||||||
|
|
||||||
# example config
|
# example config
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
_:
|
_:
|
||||||
|
|
||||||
{
|
{
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "24.05";
|
||||||
terminal.colors = {
|
terminal.colors = {
|
||||||
background = "#FFFFFF";
|
background = "#FFFFFF";
|
||||||
foreground = "#000000";
|
foreground = "#000000";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue