From 87aa88bee6bc41fb9d4b13dc860b464687042b77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Feb 2023 19:20:31 +0000
Subject: [PATCH 1/4] build(deps): bump cachix/install-nix-action from 18 to 19

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 18 to 19.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v18...v19)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-flake-lock.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index 2559594..6a3bd77 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install Nix
-        uses: cachix/install-nix-action@v18
+        uses: cachix/install-nix-action@v19
         with:
           extra_nix_config: |
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

From e673fb3ac1e7af59e667a83132ac023f789c16f6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 7 Feb 2023 13:37:41 +0100
Subject: [PATCH 2/4] ci: remove unneeded github token

v19 of the action has a default token that works well
---
 .github/workflows/update-flake-lock.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index 6a3bd77..8243371 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -12,9 +12,6 @@ jobs:
         uses: actions/checkout@v3
       - name: Install Nix
         uses: cachix/install-nix-action@v19
-        with:
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v16
         with:

From 65ff2f9f63985c9e9e5b7a684dd0a14101d1aaeb Mon Sep 17 00:00:00 2001
From: Tomas Zaluckij <mrtomaszal@gmail.com>
Date: Wed, 8 Feb 2023 23:37:37 +0000
Subject: [PATCH 3/4] fix mdadm raid device numbering style

---
 types/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/default.nix b/types/default.nix
index 403b861..8d4d637 100644
--- a/types/default.nix
+++ b/types/default.nix
@@ -55,8 +55,10 @@ rec {
         dev + toString index  # /dev/{s,v}da style
       else if match "/dev/(disk|zvol)/.+" dev != null then
         "${dev}-part${toString index}" # /dev/disk/by-id/xxx style, also used by zfs's zvolumes
-      else if match "/dev/(nvme|md/|mmcblk).+" dev != null then
+      else if match "/dev/((nvme|mmcblk).+|md/.*[[:digit:]])" dev != null then
         "${dev}p${toString index}" # /dev/nvme0n1p1 style
+      else if match "/dev/md/.+" dev != null then
+        "${dev}${toString index}" # /dev/md/raid1 style
       else
         abort ''
           ${dev} seems not to be a supported disk format. Please add this to disko in https://github.com/nix-community/disko/blob/master/types/default.nix

From 4d72200b80fcc987fd769f290ae048aa866fd994 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Feb 2023 01:38:57 +0000
Subject: [PATCH 4/4] 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/d840126a0890621e7b220894d749132dd4bde6a0' (2023-02-05)
  → 'github:NixOS/nixpkgs/1046c7b92e908a1202c0f1ba3fc21d19e1cf1b62' (2023-02-06)
---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index fb910dc..f67de2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1675584158,
-        "narHash": "sha256-SBkchaDzCHxnPNRDdtZ5ko5caHio9iS0Mbyn/xXbXxs=",
+        "lastModified": 1675698036,
+        "narHash": "sha256-BgsQkQewdlQi8gapJN4phpxkI/FCE/2sORBaFcYbp/A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d840126a0890621e7b220894d749132dd4bde6a0",
+        "rev": "1046c7b92e908a1202c0f1ba3fc21d19e1cf1b62",
         "type": "github"
       },
       "original": {