Commit graph

199 commits

Author SHA1 Message Date
Adam C. Stephens 7eef130c2c
nixos/lxd: remove container and virtual-machine releases 2025-09-13 12:44:42 -04:00
Wolfgang Walther 5a0711127c
treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
phaer 5aba7c7131
openstack-image-zfs: drop ".root" suffix in generated image name
hydra-build-products is automatically updated with the right name, as
is image-info.json.

This breaks hardcoded uses of the filename, but ensures that all the
other outputs are consistent and image.filePath is correct
2025-07-18 11:12:09 -07:00
phaer 8cbc6d6da6
amazon-image: fix image.extension value for vpc/vhd files
vpc files use the extension "vhd". `make-disk-image-nix` contains a
lookup table, but does not expose that. vpc is the only format
supported by the amazon image which is affected. Format and extension
are the same for raw and qcow2.
2025-07-18 11:12:08 -07:00
phaer 813d0ba1fb amazon-image: Increase diskSize 3 -> 4GB
Disk usage of the image has risen considerably since last release. We
still need to investigate the cause in detail. Increasing it for now
prevents build failures at least.
2025-05-19 12:53:40 +02:00
phaer 8ccd7e5d9a amazon-image: Remove tags from label, use version only
By default, `system.nixos.label` includes `system.nixos.tags` which
historically was not set for the amazon image.

Keeping the tag in the label of the generated disk image inside the
derivation (i.e. `image.filePath`) makes it easier to tell that the
file is for amazon (i.e.
`nixos-image-amazon-25.11pre-git-x86_64-linux.vpc`) while the "label"
in `image-info.json` for users of the AWS api stays stable (i.e.
`/25.05pre-git-x86_64-linux`).

`
2025-05-19 12:53:40 +02:00
phaer d7e76ed0a2 cloudstack: add to image/images
This was an oversight in https://github.com/NixOS/nixpkgs/pull/347275,
so it's currently missing from the variants listed in nixos-rebuild build-image
2025-04-14 14:03:58 +02:00
Silvan Mosberger 374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Wolfgang Walther b19d0f6d3d
treewide: replace substituteAll with replaceVars 2025-02-10 22:51:56 +01:00
phaer 53e68e04f2 openstack-image-zfs: use system.build.image 2024-12-16 15:35:21 +01:00
phaer e04d4cc0ea openstack-image: use system.build.image 2024-12-16 15:35:21 +01:00
phaer fdb144fb41 ec2/amazon-image: use system.build.image
and rename:
- amazonImage.name -> image.baseName
2024-12-16 15:35:21 +01:00
phaer 44520c1a05 amazon-image: update nixos-generators reference in README.md 2024-12-16 00:40:59 +01:00
Silvan Mosberger 4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
phaer c6da9ef32d modules/virtualisation: add unified diskSize opt
See https://github.com/NixOS/nixpkgs/pull/339535 and https://github.com/NixOS/nixpkgs/pull/341058
2024-10-27 12:28:37 +01:00
phaer 88b285c01d nixos/virtualisation: format image-related files 2024-10-18 13:32:50 +02:00
Martin Weinelt 4cec81a995
Revert "modules/virtualisation: add shared options, merge various diskSize options" (#340894)
Breaks evaluation of all nixos tests, and is therefore a channel blocker.
2024-09-10 03:12:55 +02:00
phaer 52561c65a2 openstack-image-zfs: increase build-time RAM 2024-09-05 15:56:25 +02:00
phaer db8d63ba70 openstack-image-zfs: sizeMB -> virt[...].diskSize 2024-09-05 15:56:25 +02:00
phaer 759de4c54d amazon-image: sizeMB -> virtualisation.diskSize 2024-09-05 15:56:25 +02:00
phaer 04fadac429 run nixfmt-rfc-style 2024-09-05 15:56:22 +02:00
Adam Stephens 094f2b6c9d
nixos/incus: add incus-only vm and container images 2024-08-10 13:23:36 -04:00
Philip Taron 4c7b49613a nixcfg-azure-devenv: avoid top-level with in shell.nix 2024-07-29 19:46:18 +02:00
Sigmanificient 6dd44107ac treewide: remove unused lib (and other) arguments 2024-07-26 11:18:09 +02:00
Philip Taron 3ba72e2834
nixos/amazon-image: avoid top-level with statements in maintainers script 2024-07-15 22:02:39 -07:00
Adam C. Stephens 72f73120fc
Merge pull request #316162 from adamcstephens/lxd/vm-cfg-rw
lxd-virtual-machine-image: install initial configuration read-write
2024-06-04 00:16:12 -04:00
Sandro 729002e6ce
Merge pull request #264635 from baloo/baloo/amazon-image/pkg-reimport 2024-06-02 23:42:06 +02:00
Adam Stephens dfd0d14efc
lxd-virtual-machine-image: install initial configuration read-write 2024-05-31 10:19:37 -04:00
Arian van Putten a48cd7d56f nixos/amazon-image: Drop create-amis.sh script and update docs
We replaced this with automation in https://github.com/NixOS/amis

Also add some docs how you can build the image yourself
2024-05-25 10:01:02 +02:00
Arthur Gautier 69c2090e98 amazon-image: allow pkgs overrides
By reimporting pkgs this drops overlays.

This reverts 0d3738cdcc
(`Fix the EC2 test`). Reasoning behind the reimport is blurry to me.
2024-05-09 09:48:07 -07:00
stuebinm 6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Adam C. Stephens 6a6f5206d7
Merge pull request #287100 from mkg20001/lxd-fix-config
lxd-container-image: set mode of configuration.nix
2024-02-15 07:48:05 -05:00
Adam Stephens cf68af8561
nixos/lxc/container: switch to networkd by default 2024-02-12 16:26:30 -05:00
Adam Stephens bdc79efc2b
nixos/lxd/vm: fix network config 2024-02-12 16:26:29 -05:00
Maciej Krüger 7e2cabc5ea
Merge pull request #287270 from mweinelt/lxd-networkd
nixos/lxd: use networkd for DHCP/RA
2024-02-11 15:40:59 +01:00
Arian van Putten a1232992ac nixos/amazon-image: Take over maintainership
I am actively working on bringing back Amazon Images for 24.05.
Please track progress in https://github.com/nixos/amis
2024-02-09 18:02:40 +01:00
Martin Weinelt 73e19e1a8d
nixos/lxd: use networkd for DHCP/RA
Enables networkd instead of dhcpcd for DHCP/RA. It offers a solid base
for network configuration, that is much more extensible than dhcpcd and
also better maintained than our bespoke `networking.interfaces` modules.

Closes: #287269
2024-02-08 17:57:46 +01:00
Maciej Krüger 2ce33c60cf
lxd-container-image: set mode of configuration.nix
before:
```
[root@nixos:~]# ls -la /etc/nixos
total 16
drwxr-xr-x  2 root root 4096 Feb  8 00:51 .
drwxr-xr-x 16 root root 4096 Feb  8 00:51 ..
-r--r--r--  1 root root  605 Feb  8 00:51 configuration.nix
-rw-r--r--  1 root root  150 Feb  8 00:51 lxd.nix
```

after:
```
[root@nixos:~]# ls -la /etc/nixos
total 16
drwxr-xr-x  2 root root 4096 Feb  8 00:50 .
drwxr-xr-x 16 root root 4096 Feb  8 00:50 ..
-rw-r--r--  1 root root  605 Feb  8 00:50 configuration.nix
-rw-r--r--  1 root root  149 Feb  8 00:50 lxd.nix
```
2024-02-08 01:52:05 +01:00
Ryan Lahfa f520eb3f0c
Merge pull request #263658 from siriobalmelli-foss/sb/zfs-image
openstack-image-zfs and make-single-disk-zfs-image: optionally specify qemu instance memory
2024-01-12 20:25:26 +01:00
Robert Hensing 4d1f62836e scripts/create-amis.sh: Update region list 2023-12-05 18:30:52 +01:00
Maciej Krüger daff2bb01d
maintainers/lxd: fix double modules
Otherwise it results in <nixpkgs/nixos/modules/modules...> being loaded
2023-11-22 13:25:17 +01:00
Sirio Balmelli eac98ed50e
openstack-image-zfs: add 'ramMB' option to configure build VM memory
Increase 'ramMB' to avoid OOM errors when building images.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
2023-10-31 08:28:45 +01:00
K900 67f87ecc27 nixos/maintainers/scripts/lxd: simplify config generation
Use modulesPath so we don't have to magically rewrite paths in activation script,
set stateVersion to the one this was built with (which should approximate "first install")
2023-10-27 12:56:12 +03:00
K900 100931cca6 nixos/maintainers/scripts/azure-new: remove stateVersion assignment
We should really have the user set it, or at least have a warning.
2023-10-27 12:56:12 +03:00
Thiago Kenji Okada 371cebacb5 maintainers/scripts/oci: add missing parameter 2023-09-21 22:57:39 +01:00
Thiago Kenji Okada c655cdb536 maintainers/scripts/oci: make scripts fail on error 2023-09-21 22:57:39 +01:00
ilian e8fc4d22e9 maintainers/scripts/oci: Fix indentation 2023-09-21 22:57:39 +01:00
Samuel Dionne-Riel 5056824e64 maintainers/scripts/oci: Allow A1 image builds 2023-09-21 22:15:22 +01:00
ilian 362d1d6218 oci-image: init scripts to build and upload image
Add image configuration for Oracle Cloud Infrastructure and scripts to
build and upload the image as a Custom Image.
2023-09-21 22:15:22 +01:00
Adam Stephens efd1605be6
nixos/lxd: add virtual-machine support, image and module 2023-09-03 20:06:44 -04:00