Merge branch 'master' of https://github.com/nix-community/disko into FORMAT-WITH-STATIX-OPTIONS

.github/workflows/update-flake-lock.yml

@@ -11,10 +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 }}
       - name: Update flake.lock
         uses: DeterminateSystems/update-flake-lock@v16
         with:

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1675584158,
+        "lastModified": 1675698036,
-        "narHash": "sha256-SBkchaDzCHxnPNRDdtZ5ko5caHio9iS0Mbyn/xXbXxs=",
+        "narHash": "sha256-BgsQkQewdlQi8gapJN4phpxkI/FCE/2sORBaFcYbp/A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d840126a0890621e7b220894d749132dd4bde6a0",
+        "rev": "1046c7b92e908a1202c0f1ba3fc21d19e1cf1b62",
         "type": "github"
       },
       "original": {

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