···3334<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
3500036- `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details.
3738- `timescaledb` requires manual upgrade steps.
···3334<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
3536+- `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.
37+ See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.
38+39- `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details.
4041- `timescaledb` requires manual upgrade steps.
+4-1
nixos/lib/make-disk-image.nix
···163, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
164 format ? "raw"
165000166 # Whether to fix:
167 # - GPT Disk Unique Identifier (diskGUID)
168 # - GPT Partition Unique Identifier: depends on the layout, root partition UUID can be controlled through `rootGPUID` option
···208209 compress = lib.optionalString (format' == "qcow2-compressed") "-c";
210211- filename = "nixos." + {
212 qcow2 = "qcow2";
213 vdi = "vdi";
214 vpc = "vhd";
···163, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
164 format ? "raw"
165166+, # Disk image filename, without any extensions (e.g. `image_1`).
167+ baseName ? "nixos"
168+169 # Whether to fix:
170 # - GPT Disk Unique Identifier (diskGUID)
171 # - GPT Partition Unique Identifier: depends on the layout, root partition UUID can be controlled through `rootGPUID` option
···211212 compress = lib.optionalString (format' == "qcow2-compressed") "-c";
213214+ filename = "${baseName}." + {
215 qcow2 = "qcow2";
216 vdi = "vdi";
217 vpc = "vhd";
···1+{
2+ lib,
3+ config,
4+ pkgs,
5+ ...
6+}:
7+{
8+ options.image = {
9+ baseName = lib.mkOption {
10+ type = lib.types.str;
11+ default = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
12+ description = ''
13+ Basename of the image filename without any extension (e.g. `image_1`).
14+ '';
15+ };
16+17+ extension = lib.mkOption {
18+ type = lib.types.str;
19+ description = ''
20+ Extension of the image filename (e.g. `raw`).
21+ '';
22+ };
23+24+ # FIXME: this should be marked readOnly, when there are no
25+ # mkRenamedOptionModuleWith calls with `image.fileName` as
26+ # as a target left anymore (i.e. 24.11). We can't do it
27+ # before, as some source options where writable before.
28+ # Those should use image.baseName and image.extension instead.
29+ fileName = lib.mkOption {
30+ type = lib.types.str;
31+ default = "${config.image.baseName}.${config.image.extension}";
32+ description = ''
33+ Filename of the image including all extensions (e.g `image_1.raw` or
34+ `image_1.raw.zst`).
35+ '';
36+ };
37+38+ filePath = lib.mkOption {
39+ type = lib.types.str;
40+ default = config.image.fileName;
41+ description = ''
42+ Path of the image, relative to `$out` in `system.build.image`.
43+ While it defaults to `config.image.fileName`, it can be different for builders where
44+ the image is in sub directory, such as `iso`, `sd-card` or `kexec` images.
45+ '';
46+ };
47+ };
48+}
···176 fi
177 source $stdenv/setup
178179- # Set the system time from the hardware clock. Works around an
180- # apparent KVM > 1.5.2 bug.
181- ${util-linux}/bin/hwclock -s
182-183 export NIX_STORE=${storeDir}
184 export NIX_BUILD_TOP=/tmp
185 export TMPDIR=/tmp
···30 urls = [
31 "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
32 # Upstream removes downloads of older versions, please save bumped versions to archive.org
33- # FIXME At the time of writing, archive.org is still recovering from the recent attacks and has not yet re-opened the page saving functionality
34- # https://blog.archive.org/2024/10/21/internet-archive-services-update-2024-10-21/
35 ];
36 hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
37 };
···30 urls = [
31 "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
32 # Upstream removes downloads of older versions, please save bumped versions to archive.org
33+ "https://web.archive.org/web/20241121002213/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
034 ];
35 hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
36 };