Commit Graph

937 Commits

Author SHA1 Message Date
lassulus
f1e929d121
Merge pull request #698 from MatthewCroughan/mc/make-builder-kernel-configurable
make-disk-image: make pkgs, qemu and kernelPackages configurable and overridable
2024-08-14 23:08:31 +02:00
matthewcroughan
d8a1d5e1f0 make-disk-image: allow vmTools qemu usage to be overriden by disko configuration
This is needed to prevent two layers of emulation when offering a build for a host running binfmt such as an x86 host trying to compile for aarch64 via binfmt
2024-08-14 20:05:56 +01:00
matthewcroughan
de015d2a44 make-disk-image: allow pkgs to be overriden by disko configuration
This is needed when the nixosConfig you're building for modifies nixpkgs options that lead to evaluation failing unnecessarily
2024-08-14 20:05:56 +01:00
matthewcroughan
f5cc4b55e5 make-disk-image: allow kernel to be overriden by disko configuration
This is especially useful when trying to build images for embedded systems such as the pi, which have a vendor kernel that can't be booted as part of the disko image builder process
2024-08-14 20:05:56 +01:00
github-actions[bot]
0d510fe40b flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7?narHash=sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0%3D' (2024-08-07)
  → 'github:NixOS/nixpkgs/154bcb95ad51bc257c2ce4043a725de6ca700ef6?narHash=sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8%3D' (2024-08-09)
2024-08-12 01:38:30 +00:00
github-actions[bot]
ffc1f95f6c flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/81610abc161d4021b29199aa464d6a1a521e0cc9?narHash=sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX%2Bd7rqnDUoRaY%3D' (2024-08-02)
  → 'github:NixOS/nixpkgs/f5129fb42b9c262318130a97b47516946da3e7d7?narHash=sha256-O/kxmybNecC3Efr6ITOdtCzFv90/B2Iiedavj5aRWt0%3D' (2024-08-07)
2024-08-08 01:33:08 +00:00
github-actions[bot]
0257e44f4a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce?narHash=sha256-5US0/pgxbMksF92k1%2BeOa8arJTJiPvsdZj9Dl%2BvJkM4%3D' (2024-07-31)
  → 'github:NixOS/nixpkgs/81610abc161d4021b29199aa464d6a1a521e0cc9?narHash=sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX%2Bd7rqnDUoRaY%3D' (2024-08-02)
2024-08-05 01:36:45 +00:00
github-actions[bot]
7e1b215a0a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/038fb464fcfa79b4f08131b07f2d8c9a6bcc4160?narHash=sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y%3D' (2024-07-28)
  → 'github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce?narHash=sha256-5US0/pgxbMksF92k1%2BeOa8arJTJiPvsdZj9Dl%2BvJkM4%3D' (2024-07-31)
2024-08-01 01:47:25 +00:00
github-actions[bot]
1e6f8a7b46 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/733453ac54a40997a6a690b60f3942d79560247c?narHash=sha256-Hwm46lggqtihMaRuxbNaC1ACcU2a0jO/HXqrdjMatXk%3D' (2024-07-26)
  → 'github:NixOS/nixpkgs/038fb464fcfa79b4f08131b07f2d8c9a6bcc4160?narHash=sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y%3D' (2024-07-28)
2024-07-29 01:50:15 +00:00
github-actions[bot]
5b01cea8b5 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4f02464258baaf54992debfd010a7a3662a25536?narHash=sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs%3D' (2024-07-24)
  → 'github:NixOS/nixpkgs/733453ac54a40997a6a690b60f3942d79560247c?narHash=sha256-Hwm46lggqtihMaRuxbNaC1ACcU2a0jO/HXqrdjMatXk%3D' (2024-07-26)
2024-07-26 21:08:25 +00:00
github-actions[bot]
55e874b9c1 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46?narHash=sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI%3D' (2024-07-21)
  → 'github:NixOS/nixpkgs/4f02464258baaf54992debfd010a7a3662a25536?narHash=sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs%3D' (2024-07-24)
2024-07-25 01:32:08 +00:00
beviu
4698b1ef37 disko: add nixos-install-tools to PATH
When running disko-install from a distribution that is not NixOS,
the nixos-install command was failing due to nixos-install not
being in PATH.

Fix the error by adding the nixos-install-tools package to the list
of packages passed to lib.makeBinPath.
2024-07-23 11:53:45 +00:00
github-actions[bot]
2f5df5dcce flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9355fa86e6f27422963132c2c9aeedb0fb963d93?narHash=sha256-%2B%2BTYlGMAJM1Q%2B0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU%3D' (2024-07-16)
  → 'github:NixOS/nixpkgs/c19d62ad2265b16e2199c5feb4650fe459ca1c46?narHash=sha256-cFgdjyK/VBM3hB1RfFHXcI/VOCBVAv813s1upHKX7bI%3D' (2024-07-21)
2024-07-22 01:35:07 +00:00
Jörg Thalheim
bec6e3cde9 examples: rename vdb -> main 2024-07-19 19:33:40 +00:00
github-actions[bot]
e8e8d9a3a9 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14)
  → 'github:NixOS/nixpkgs/9355fa86e6f27422963132c2c9aeedb0fb963d93?narHash=sha256-%2B%2BTYlGMAJM1Q%2B0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU%3D' (2024-07-16)
2024-07-18 01:31:28 +00:00
github-actions[bot]
bad376945d flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/aa9461550594533c29866d42f861b6ff079a7fb6?narHash=sha256-w6dlBUQYvS65f0Z33TvkcAj7ITr4NFqhF5ywss5T5bU%3D' (2024-07-10)
  → 'github:NixOS/nixpkgs/aa247c0c90ecf4ae7a032c54fdc21b91ca274062?narHash=sha256-GaliJqfFwyYxReFywxAa8orCO%2BEnDq2NK2F%2B5aSc8vo%3D' (2024-07-14)
2024-07-15 01:33:19 +00:00
github-actions[bot]
786965e1b1 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b?narHash=sha256-PlL/yXNX/C87S2N8lF/HfOJhHForf/l7E6lVWZ4jMrw%3D' (2024-07-07)
  → 'github:NixOS/nixpkgs/aa9461550594533c29866d42f861b6ff079a7fb6?narHash=sha256-w6dlBUQYvS65f0Z33TvkcAj7ITr4NFqhF5ywss5T5bU%3D' (2024-07-10)
2024-07-11 01:31:19 +00:00
github-actions[bot]
f1a00e7f55 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/61684d356e41c97f80087e89659283d00fe032ab?narHash=sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY%3D' (2024-07-03)
  → 'github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b?narHash=sha256-PlL/yXNX/C87S2N8lF/HfOJhHForf/l7E6lVWZ4jMrw%3D' (2024-07-07)
2024-07-08 01:33:09 +00:00
github-actions[bot]
64679cd7f3 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b3f3c1b13fb08f3828442ee86630362e81136bbc?narHash=sha256-u%2BD%2BIOAMMl70%2BCJ9NKB%2BRMrASjInuIWMHzjLWQjPZ6c%3D' (2024-06-26)
  → 'github:NixOS/nixpkgs/61684d356e41c97f80087e89659283d00fe032ab?narHash=sha256-Q92DHQjIvaMLpawMdXnbKQjCkzAWqjhjWJYS5RcKujY%3D' (2024-07-03)
2024-07-04 01:30:46 +00:00
Jörg Thalheim
544a80a69d
Merge pull request #694 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-23
build(deps): bump DeterminateSystems/update-flake-lock from 22 to 23
2024-07-01 22:05:45 +02:00
dependabot[bot]
895b2713e1
build(deps): bump DeterminateSystems/update-flake-lock from 22 to 23
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 22 to 23.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v22...v23)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 19:18:07 +00:00
Jörg Thalheim
d185770ea2 examples: drop priority as we now have a reasonable default 2024-06-30 07:50:33 +00:00
Jörg Thalheim
05f4e223b5 gpt: move boot partitions to the front of disko
Than we no longer need to do this in our examples.

Co-authored-by: Brennan Kinney <5098581+polarathene@users.noreply.github.com>
2024-06-30 07:50:33 +00:00
Jörg Thalheim
423b86a7f7 disko-install: don't copy channel
Since we use flakes, channels have no buisness.
This is consistent with nixos-anywhere.
2024-06-29 05:47:47 +00:00
Jörg Thalheim
115311bc39 zfs: try to import zpool in incremental mode
if the pool is not imported, zfs list will return a value. So to check
that the pool does not exist, we also import it.

fixes https://github.com/nix-community/disko/issues/690
2024-06-28 13:52:20 +00:00
lassulus
e8ef4773dd
Merge pull request #689 from nix-community/incremental-zfs
zfs: when dataset already exist, only update dataset options
2024-06-28 14:29:41 +02:00
Jörg Thalheim
96cab883db zfs: when dataset already exist, only update dataset options 2024-06-28 13:53:07 +02:00
github-actions[bot]
8767dbf5d7 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681?narHash=sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs%3D' (2024-06-22)
  → 'github:NixOS/nixpkgs/b3f3c1b13fb08f3828442ee86630362e81136bbc?narHash=sha256-u%2BD%2BIOAMMl70%2BCJ9NKB%2BRMrASjInuIWMHzjLWQjPZ6c%3D' (2024-06-26)
2024-06-27 01:28:30 +00:00
Matthew_Cash
b6a1262796 lvm_vg: add lvm thinpool/thinlv support
Co-authored-by: ajs124 <git@ajs124.de>
2024-06-26 11:36:52 +00:00
lassulus
dd4d1663cc document extraRootModules better 2024-06-24 13:36:20 +00:00
github-actions[bot]
50d4d13fba flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/38d3352a65ac9d621b0cd3074d3bef27199ff78f?narHash=sha256-pmjP5ePc1jz%2BOkona3HxD7AYT0wbrCwm9bXAlj08nDM%3D' (2024-06-17)
  → 'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681?narHash=sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs%3D' (2024-06-22)
2024-06-24 01:44:17 +00:00
github-actions[bot]
e1174d9919 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb?narHash=sha256-u1fA0DYQYdeG%2B5kDm1bOoGcHtX0rtC7qs2YA2N1X%2B%2BI%3D' (2024-06-13)
  → 'github:NixOS/nixpkgs/38d3352a65ac9d621b0cd3074d3bef27199ff78f?narHash=sha256-pmjP5ePc1jz%2BOkona3HxD7AYT0wbrCwm9bXAlj08nDM%3D' (2024-06-17)
2024-06-20 01:26:28 +00:00
name_snrl
48580409a2 also add indentation to the hooks 2024-06-19 18:46:17 +00:00
name_snrl
248f65b9c4 fix option type in mkHook 2024-06-19 18:46:17 +00:00
github-actions[bot]
8262659fc9 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e913ae340076bbb73d9f4d3d065c2bca7caafb16?narHash=sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8%3D' (2024-06-11)
  → 'github:NixOS/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb?narHash=sha256-u1fA0DYQYdeG%2B5kDm1bOoGcHtX0rtC7qs2YA2N1X%2B%2BI%3D' (2024-06-13)
2024-06-17 01:43:45 +00:00
github-actions[bot]
832a9f2c81 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9?narHash=sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY%3D' (2024-06-08)
  → 'github:NixOS/nixpkgs/e913ae340076bbb73d9f4d3d065c2bca7caafb16?narHash=sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8%3D' (2024-06-11)
2024-06-13 01:27:43 +00:00
Jörg Thalheim
c1cfbfad7c
Merge pull request #670 from ginkogruen/patch-1
fix(docs): fixed typo in README.md
2024-06-10 10:33:59 +02:00
Jörg Thalheim
2540cc069f
Merge branch 'master' into patch-1 2024-06-10 10:14:22 +02:00
github-actions[bot]
78beee3b7a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3b01abcc24846ae49957b30f4345bab4b3f1d14b?narHash=sha256-I8/plBsua4/NZ5bKgj%2Bz7/ThiWuud1YFwLsn1QQ5PgE%3D' (2024-06-04)
  → 'github:NixOS/nixpkgs/cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9?narHash=sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY%3D' (2024-06-08)
2024-06-10 01:36:49 +00:00
Jörg Thalheim
1bbdb06f14 update quickstart to use templates from disko-templates 2024-06-09 06:40:59 +00:00
Jörg Thalheim
804ab2de77 treewide: reformat with nix fmt 2024-06-09 06:40:59 +00:00
Jörg Thalheim
dd378f1d58
README: link to matrix channel 2024-06-09 08:19:24 +02:00
Jörg Thalheim
69e5942c9d
README: drop numtide contributing guidelines
We don't have anything for disko yet unfortunately.
fixes https://github.com/nix-community/disko/issues/671
2024-06-09 08:15:08 +02:00
ginkogruen
3db4bf7771
fix(docs): fixed typo in README.md 2024-06-09 02:11:53 +02:00
Jörg Thalheim
398acc470f update to new nixos test api 2024-06-07 14:20:40 +00:00
github-actions[bot]
713aa3df48 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6132b0f6e344ce2fe34fc051b72fb46e34f668e0?narHash=sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY%3D' (2024-05-30)
  → 'github:NixOS/nixpkgs/3b01abcc24846ae49957b30f4345bab4b3f1d14b?narHash=sha256-I8/plBsua4/NZ5bKgj%2Bz7/ThiWuud1YFwLsn1QQ5PgE%3D' (2024-06-04)
2024-06-06 01:26:12 +00:00
Jörg Thalheim
7fc7009c89 docs/disko-images: drop non-existing flag
fixes https://github.com/nix-community/disko/issues/664
2024-06-05 08:06:42 +00:00
Jörg Thalheim
a838e83e21
Merge pull request #662 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-22
build(deps): bump DeterminateSystems/update-flake-lock from 21 to 22
2024-06-04 10:47:01 +02:00
dependabot[bot]
edbffbf524
build(deps): bump DeterminateSystems/update-flake-lock from 21 to 22
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 21 to 22.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v21...v22)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-03 19:40:00 +00:00
Jörg Thalheim
b106b5df36 also link gpt migration guide in the manual 2024-06-03 11:58:45 +00:00