technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #198 #202

Browse source 
198: flake.lock: Update r=Mic92 a=disko-bot



202: upgrade-guide: fix markdown syntax r=Mic92 a=Mic92



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-04-15 15:19:26 +00:00 • committed by GitHub
commit bcf896ef4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
docs/upgrade-guide.md
View file

@ -1,4 +1,4 @@
2023-04-07 7d70009 # 2023-04-07 7d70009
Changes: Changes:
@ -9,6 +9,7 @@ Changes:
Updated example/zfs.nix file: Updated example/zfs.nix file:
```nix ```nix
{
datasets = { datasets = {
zfs_fs = { zfs_fs = {
type = "zfs_fs"; type = "zfs_fs";
@ -29,17 +30,18 @@ datasets = {
size = "10M"; size = "10M";
content = { content = {
type = "filesystem"; 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. 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: For example, if you were defining an `lvm_lv` type like this:
```nix ```nix
@ -48,6 +50,7 @@ For example, if you were defining an `lvm_lv` type like this:
size = "10G"; size = "10G";
# ... # ...
} }
```
You should now define it like this: 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. 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 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 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

6
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680668850, "lastModified": 1681272286,
"narHash": "sha256-mQMg13yRsS0LXVzaeoSPwqgPO6yhkGzGewPgMSqXSv8=", "narHash": "sha256-9X5p+gwYrowgbsRgkf14HFI0fkr6UikuwRIQAMlF1yI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a65e9f64e53fdca6eed31adba836717a11247d2", "rev": "6b70761ea8c896aff8994eb367d9526686501860",
"type": "github" "type": "github"
}, },
"original": { "original": {