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

release: update all references to 20.03 with 20.09

Browse source
This commit is contained in:
Tobias Happ 2020-11-01 21:52:04 +01:00 • committed by Alexander Sosedkin
parent e6c7adaca0
commit d8a1d446f9
5 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -52,7 +52,7 @@ for example:
{ {
environment.packages = [ pkgs.vim ]; environment.packages = [ pkgs.vim ];
system.stateVersion = "20.03"; system.stateVersion = "20.09";
} }
``` ```
@ -66,7 +66,7 @@ An alternative location is `~/.config/nixpkgs/config.nix` with the key
{ {
environment.packages = [ pkgs.vim ]; environment.packages = [ pkgs.vim ];
system.stateVersion = "20.03"; system.stateVersion = "20.09";
}; };
} }
``` ```
@ -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:
``` ```
nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
nix-channel --update nix-channel --update
``` ```
2. Configure `home-manager`: 2. Configure `home-manager`:

28
default.nix
View file

@ -25,8 +25,8 @@ rec {
is present) there is one manual step necessary *before* running the migration script: Remove basic-environment \ is present) there is one manual step necessary *before* running the migration script: Remove basic-environment \
package of 'home.packages' list." package of 'home.packages' list."
echo echo
echo "Recommended: change home-manager channel to release-20.03:" echo "Recommended: change home-manager channel to release-20.09:"
echo " nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager" echo " nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager"
echo echo
echo "Recommended: set nix-on-droid channel to a505862" echo "Recommended: set nix-on-droid channel to a505862"
echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/pre-module-system.tar.gz nix-on-droid" echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/pre-module-system.tar.gz nix-on-droid"
@ -38,8 +38,8 @@ rec {
echo echo
echo "Recommended: update with what you've used before (home-manager switch -or- nix-env -u)" echo "Recommended: update with what you've used before (home-manager switch -or- nix-env -u)"
echo echo
echo "Required if you've followed the steps above: set nix-on-droid channel to release-20.03" echo "Required if you've followed the steps above: set nix-on-droid channel to release-20.09"
echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/release-20.03.tar.gz nix-on-droid" echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/release-20.09.tar.gz nix-on-droid"
echo echo
echo "Finally," echo "Finally,"
echo " nix-shell '<nix-on-droid>' -A migration" echo " nix-shell '<nix-on-droid>' -A migration"
@ -73,44 +73,48 @@ rec {
echo "Migrating home-manager installation..." echo "Migrating home-manager installation..."
if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" '' ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@@ -27,15 +27,9 @@ @@ -30,18 +30,8 @@
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "20.03"; system.stateVersion = "20.09";
- # After installing home-manager channel like - # After installing home-manager channel like
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager - # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.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.config = - #home-manager.config =
- # { pkgs, ... }: - # { pkgs, ... }:
- # { - # {
- # # Read the changelog before changing this value
- # system.stateVersion = "20.09";
- #
- # # insert home-manager config - # # insert home-manager config
- # }; - # };
+ # Home Manager config file + # Home Manager config file
+ home-manager.config = import ./home.nix; + home-manager.config = import ./home.nix;
+ home-manager.useUserPackages = true;
} }
# vim: ft=nix # vim: ft=nix
''} > /dev/null ''} > /dev/null
else else
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" '' ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@@ -27,15 +27,9 @@ @@ -30,18 +30,8 @@
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "20.03"; system.stateVersion = "20.09";
- # After installing home-manager channel like - # After installing home-manager channel like
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager - # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.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.config = - #home-manager.config =
- # { pkgs, ... }: - # { pkgs, ... }:
- # { - # {
- # # Read the changelog before changing this value
- # system.stateVersion = "20.09";
- #
- # # insert home-manager config - # # insert home-manager config
- # }; - # };
+ # Home Manager config file + # Home Manager config file
+ home-manager.config = import (builtins.getEnv "HOME_MANAGER_CONFIG"); + home-manager.config = import (builtins.getEnv "HOME_MANAGER_CONFIG");
+ home-manager.useUserPackages = true;
} }
# vim: ft=nix # vim: ft=nix

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

@ -13,13 +13,13 @@ with lib;
build.channel = { build.channel = {
nixpkgs = mkOption { nixpkgs = mkOption {
type = types.str; type = types.str;
default = "https://nixos.org/channels/nixos-20.03"; default = "https://nixos.org/channels/nixos-20.09";
description = "Channel URL for nixpkgs."; description = "Channel URL for nixpkgs.";
}; };
nix-on-droid = mkOption { nix-on-droid = mkOption {
type = types.str; type = types.str;
default = "https://github.com/t184256/nix-on-droid/archive/release-20.03.tar.gz"; default = "https://github.com/t184256/nix-on-droid/archive/release-20.09.tar.gz";
description = "Channel URL for nix-on-droid."; description = "Channel URL for nix-on-droid.";
}; };
}; };

7
modules/environment/login/nix-on-droid.nix.default
View file

@ -28,15 +28,18 @@
environment.etcBackupExtension = ".bak"; environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "20.03"; system.stateVersion = "20.09";
# After installing home-manager channel like # After installing home-manager channel like
# nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.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.config = #home-manager.config =
# { pkgs, ... }: # { pkgs, ... }:
# { # {
# # Read the changelog before changing this value
# home.stateVersion = "20.09";
#
# # insert home-manager config # # insert home-manager config
# }; # };
} }

8
modules/home-manager.nix
View file

@ -87,13 +87,13 @@ in
assertions = [ assertions = [
{ {
assertion = assertionNixpkgs; assertion = assertionNixpkgs;
message = "You are currently using release-19.09 branch of nixpkgs, you need " message = "You are currently using release-19.09 branch or older of nixpkgs, you need "
+ "to update to the release-20.03 channel."; + "to update to the release-20.03 channel or newer.";
} }
{ {
assertion = assertionHomeManager; assertion = assertionHomeManager;
message = "You are currently using release-19.09 branch of home-manager, you need " message = "You are currently using release-19.09 branch or older of home-manager, you need "
+ "to update to the release-20.03 channel."; + "to update to the release-20.03 channel or newer.";
} }
]; ];
} }