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

Replace 19.09 channels with 20.03 ones

Browse source
This commit is contained in:
Tobias Happ 2020-04-24 20:40:16 +02:00
parent 6e85b5cd08
commit 55d33896fd
4 changed files with 12 additions and 12 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 = "19.09"; system.stateVersion = "20.03";
} }
``` ```
@ -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 = "19.09"; system.stateVersion = "20.03";
}; };
} }
``` ```
@ -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-19.09.tar.gz home-manager nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
nix-channel --update nix-channel --update
``` ```
2. Configure `home-manager`: 2. Configure `home-manager`:

12
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-19.09:" echo "Recommended: change home-manager channel to release-20.03:"
echo " nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager" echo " nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.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"
@ -75,10 +75,10 @@ rec {
${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 @@ @@ -27,15 +27,9 @@
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "19.09"; system.stateVersion = "20.03";
- # After installing home-manager channel like - # After installing home-manager channel like
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager - # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.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 =
@ -97,10 +97,10 @@ rec {
${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 @@ @@ -27,15 +27,9 @@
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "19.09"; system.stateVersion = "20.03";
- # After installing home-manager channel like - # After installing home-manager channel like
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-19.09.tar.gz home-manager - # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.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 =

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

@ -13,7 +13,7 @@ with lib;
build.channel = { build.channel = {
nixpkgs = mkOption { nixpkgs = mkOption {
type = types.str; type = types.str;
default = "https://nixos.org/channels/nixos-19.09"; default = "https://nixos.org/channels/nixos-20.03";
description = "Channel URL for nixpkgs."; description = "Channel URL for nixpkgs.";
}; };

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

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