From c1f4517aaab1593f26db3120b2b6abdecebfed9d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 01:20:26 +0000
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4a65e9f64e53fdca6eed31adba836717a11247d2' (2023-04-05)
  → 'github:NixOS/nixpkgs/6b70761ea8c896aff8994eb367d9526686501860' (2023-04-12)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1056fab..6618d08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1680668850,
-        "narHash": "sha256-mQMg13yRsS0LXVzaeoSPwqgPO6yhkGzGewPgMSqXSv8=",
+        "lastModified": 1681272286,
+        "narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a65e9f64e53fdca6eed31adba836717a11247d2",
+        "rev": "6b70761ea8c896aff8994eb367d9526686501860",
         "type": "github"
       },
       "original": {

From 8cb5b9656a2d2696201f29562fa3221657e66fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Apr 2023 17:13:20 +0200
Subject: [PATCH 2/2] upgrade-guide: fix markdown syntax

---
 docs/upgrade-guide.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/upgrade-guide.md b/docs/upgrade-guide.md
index 7a6ceef..017ea4c 100644
--- a/docs/upgrade-guide.md
+++ b/docs/upgrade-guide.md
@@ -1,4 +1,4 @@
-2023-04-07 7d70009
+# 2023-04-07 7d70009
 
 Changes:
 
@@ -9,6 +9,7 @@ Changes:
 Updated example/zfs.nix file:
 
 ```nix
+{
 datasets = {
   zfs_fs = {
     type = "zfs_fs";
@@ -29,17 +30,18 @@ datasets = {
     size = "10M";
     content = {
       type = "filesystem";
-      ...
-
-Note: The `zfs_type` attribute has been replaced with a type attribute for each dataset, and the `size` attribute is only available for `zfs_volume`.
-These changes have been reflected in the example/zfs.nix file.
+      # ...
+}
 ```
 
-2023-04-07 654ecb3
+Note: The `zfs_type` attribute has been replaced with a type attribute for each dataset, and the `size` attribute is only available for `zfs_volume`.
+These changes have been reflected in the `example/zfs.nix` file.
+
+# 2023-04-07 654ecb3
 
 The `lvm_lv` type is always part of an `lvm_vg` and it is no longer necessary to specify the type.
 
-This means that if you were using the `lvm_lv` type in your code, you should remove it and make sure to only use the `lvm_vg` type. 
+This means that if you were using the `lvm_lv` type in your code, you should remove it. 
 For example, if you were defining an `lvm_lv` type like this:
 
 ```nix
@@ -48,6 +50,7 @@ For example, if you were defining an `lvm_lv` type like this:
   size = "10G";
   # ...
 }
+```
 
 You should now define it like this:
 
@@ -92,14 +95,14 @@ After:
 
 Note that the `type` field is no longer necessary and should be removed from your code.
 
-2023-03-22 2624af6
+# 2023-03-22 2624af6
 
 disk config now needs to be inside a disko.devices attrset always
 
-2023-03-22 0577409
+# 2023-03-22 0577409
 
 the extraArgs option in the luks type was renamed to extraFormatArgs
 
-2023-02-14 6d630b8
+# 2023-02-14 6d630b8
 
-btrfs, btrfs_subvol filesystem and lvm_lv extraArgs are now lists
+btrfs, `btrfs_subvol` filesystem and `lvm_lv` extraArgs are now lists