nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-12-08 18:11:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

update inputs and copyrights to 24.05

Browse source
This commit is contained in:
Sergey Volkov 2024-06-05 18:03:25 +02:00
parent dbd80b49d8
commit c8dc0290d2
24 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/default.nix
View file

@ -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.
{ pkgs, home-manager, nmdSrc }: { pkgs, home-manager, nmdSrc }:

6
flake.nix
View file

@ -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-06-05
# 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/b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -19,7 +19,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-docs.url = "github:NixOS/nixpkgs/release-23.11"; nixpkgs-docs.url = "github:NixOS/nixpkgs/release-24.05";
nmd = { nmd = {
url = "sourcehut:~rycee/nmd"; url = "sourcehut:~rycee/nmd";

4
modules/build/initial-build.nix
View file

@ -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";

2
modules/environment/session-init.nix
View file

@ -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, ... }:

2
modules/upgrade.nix
View file

@ -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, ... }:

8
overlays/lib/nixpkgs.nix
View file

@ -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-06-05
pinnedPkgsSrc = super.fetchFromGitHub { pinnedPkgsSrc = super.fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "1d1817869c47682a6bee85b5b0a6537b6c0fba26"; rev = "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1";
sha256 = "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0="; sha256 = "";
}; };
in in

2
pkgs/cross-compiling/talloc-static.nix
View file

@ -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

2
pkgs/default.nix
View file

@ -35,7 +35,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";

2
pkgs/proot-termux/default.nix
View file

@ -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

6
templates/advanced/flake.nix
View file

@ -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
templates/advanced/home.nix
View file

@ -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
} }

2
templates/advanced/nix-on-droid.nix
View file

@ -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 = ''

6
templates/home-manager/flake.nix
View file

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

4
templates/home-manager/nix-on-droid.nix
View file

@ -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
}; };

4
templates/minimal/flake.nix
View file

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

2
templates/minimal/nix-on-droid.nix
View file

@ -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
tests/on-device/config-flake-default.nix
View file

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

4
tests/on-device/config-flake-h-m.cfg.nix
View file

@ -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 ];

4
tests/on-device/config-flake-h-m.flake.nix
View file

@ -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";

2
tests/on-device/config-flake-hosts-localhost.cfg.nix
View file

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

2
tests/on-device/config-flake-hosts.cfg.nix
View file

@ -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
tests/on-device/config-flake.nix
View file

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

4
tests/on-device/config-h-m.nix
View file

@ -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

2
tests/on-device/config-term-colors.nix
View file

@ -1,7 +1,7 @@
_: _:
{ {
system.stateVersion = "23.11"; system.stateVersion = "24.05";
terminal.colors = { terminal.colors = {
background = "#FFFFFF"; background = "#FFFFFF";
foreground = "#000000"; foreground = "#000000";