From 0f72f26a5750502ed505a57090b55dc53b879191 Mon Sep 17 00:00:00 2001
From: Pacman99 <Pacman99@users.noreply.github.com>
Date: Thu, 27 May 2021 17:02:40 +0000
Subject: [PATCH 1/3] Update Changelog for tag

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bbb6782..b8d9a688 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## [v0.10.0](https://github.com/divnix/devos/tree/v0.10.0) (2021-05-24)
+
+**Implemented enhancements:**
+
+- Providing an interface to nixpkgs.config [\#237](https://github.com/divnix/devos/issues/237)
+- Making the user available in profiles [\#230](https://github.com/divnix/devos/issues/230)
+- copy evaluation store paths to iso [\#195](https://github.com/divnix/devos/issues/195)
+- Extract custom system builds from devosSystem out of lib [\#170](https://github.com/divnix/devos/issues/170)
+- Allow setting of channel host-wide [\#117](https://github.com/divnix/devos/issues/117)
+- alacritty: CSIu support [\#51](https://github.com/divnix/devos/issues/51)
+
+**Fixed bugs:**
+
+- Cachix timeouts + how to disable nrdxp cachix \(if needed\) [\#294](https://github.com/divnix/devos/issues/294)
+- default.nix flake-compat is broken [\#285](https://github.com/divnix/devos/issues/285)
+- All suites return "attribute missing" [\#282](https://github.com/divnix/devos/issues/282)
+- nix is built two times [\#203](https://github.com/divnix/devos/issues/203)
+- fix lib docs [\#166](https://github.com/divnix/devos/issues/166)
+
+**Closed issues:**
+
+- eliminate userFlakeNixOS [\#257](https://github.com/divnix/devos/issues/257)
+- devos-as-library [\#214](https://github.com/divnix/devos/issues/214)
+
+**Merged pull requests:**
+
+- Update evalArgs to match the new planned API [\#239](https://github.com/divnix/devos/pull/239)
+
 ## [v0.9.0](https://github.com/divnix/devos/tree/v0.9.0) (2021-04-19)
 
 **Implemented enhancements:**
@@ -77,6 +105,10 @@
 
 - add github action for cachix build ci [\#59](https://github.com/divnix/devos/issues/59)
 
+## [12052020](https://github.com/divnix/devos/tree/12052020) (2020-12-06)
+
+## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
+
 
 
 \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

From c30e8c5ca2c1aa3772b0bb1ac70eabb491fbea9c Mon Sep 17 00:00:00 2001
From: almostnobody <1583339+almostnobody@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:10:17 +0300
Subject: [PATCH 2/3] override module doc: fix #310

---
 doc/concepts/overrides.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/concepts/overrides.md b/doc/concepts/overrides.md
index 303108c0..801703bf 100644
--- a/doc/concepts/overrides.md
+++ b/doc/concepts/overrides.md
@@ -27,10 +27,11 @@ You can also pull modules from other channels. All modules have access to the
 `modulesPath` for each channel as `<channelName>ModulesPath`. And you can use
 `disabledModules` to remove modules from the current channel.
 
-Pulling the zsh module from the `latest` channel:
+To pull zsh module from the `latest` channel this code can be placed in any module, whether its your host file, a profile, or a module in ./modules etc:
 ```nix
-{ latestModulesPath }: {
-  modules = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
+{ latestModulesPath }:
+{
+  import = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
   disabledModules = [ "programs/zsh/zsh.nix" ];
 }
 ```

From d852305c4c05d7769a72ce7d6207a3d072c4d388 Mon Sep 17 00:00:00 2001
From: almostnobody <1583339+almostnobody@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:24:24 +0300
Subject: [PATCH 3/3] Update doc/concepts/overrides.md

Co-authored-by: Pacman99 <pachum99@myrdd.info>
---
 doc/concepts/overrides.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/concepts/overrides.md b/doc/concepts/overrides.md
index 801703bf..610fde04 100644
--- a/doc/concepts/overrides.md
+++ b/doc/concepts/overrides.md
@@ -31,7 +31,7 @@ To pull zsh module from the `latest` channel this code can be placed in any modu
 ```nix
 { latestModulesPath }:
 {
-  import = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
+  imports = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
   disabledModules = [ "programs/zsh/zsh.nix" ];
 }
 ```