···33333434<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
35353636+- `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.
3737+ See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.
3838+3639- `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.
37403841- `timescaledb` requires manual upgrade steps.
+4-1
nixos/lib/make-disk-image.nix
···163163, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
164164 format ? "raw"
165165166166+, # Disk image filename, without any extensions (e.g. `image_1`).
167167+ baseName ? "nixos"
168168+166169 # Whether to fix:
167170 # - GPT Disk Unique Identifier (diskGUID)
168171 # - GPT Partition Unique Identifier: depends on the layout, root partition UUID can be controlled through `rootGPUID` option
···208211209212 compress = lib.optionalString (format' == "qcow2-compressed") "-c";
210213211211- filename = "nixos." + {
214214+ filename = "${baseName}." + {
212215 qcow2 = "qcow2";
213216 vdi = "vdi";
214217 vpc = "vhd";
+48
nixos/modules/image/file-options.nix
···11+{
22+ lib,
33+ config,
44+ pkgs,
55+ ...
66+}:
77+{
88+ options.image = {
99+ baseName = lib.mkOption {
1010+ type = lib.types.str;
1111+ default = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
1212+ description = ''
1313+ Basename of the image filename without any extension (e.g. `image_1`).
1414+ '';
1515+ };
1616+1717+ extension = lib.mkOption {
1818+ type = lib.types.str;
1919+ description = ''
2020+ Extension of the image filename (e.g. `raw`).
2121+ '';
2222+ };
2323+2424+ # FIXME: this should be marked readOnly, when there are no
2525+ # mkRenamedOptionModuleWith calls with `image.fileName` as
2626+ # as a target left anymore (i.e. 24.11). We can't do it
2727+ # before, as some source options where writable before.
2828+ # Those should use image.baseName and image.extension instead.
2929+ fileName = lib.mkOption {
3030+ type = lib.types.str;
3131+ default = "${config.image.baseName}.${config.image.extension}";
3232+ description = ''
3333+ Filename of the image including all extensions (e.g `image_1.raw` or
3434+ `image_1.raw.zst`).
3535+ '';
3636+ };
3737+3838+ filePath = lib.mkOption {
3939+ type = lib.types.str;
4040+ default = config.image.fileName;
4141+ description = ''
4242+ Path of the image, relative to `$out` in `system.build.image`.
4343+ While it defaults to `config.image.fileName`, it can be different for builders where
4444+ the image is in sub directory, such as `iso`, `sd-card` or `kexec` images.
4545+ '';
4646+ };
4747+ };
4848+}
···99(
1010 (buildMozillaMach rec {
1111 pname = "floorp";
1212- packageVersion = "11.20.0";
1212+ packageVersion = "11.21.0";
1313 applicationName = "Floorp";
1414 binaryName = "floorp";
1515 branding = "browser/branding/official";
···2424 repo = "Floorp";
2525 fetchSubmodules = true;
2626 rev = "v${packageVersion}";
2727- hash = "sha256-+FVnG8CKEQdFN9bO8rUZadp+d8keCB98T7qt9OBfLDA=";
2727+ hash = "sha256-gb190h7BAt0biE/RQayyzwSFCDEMe4F8YT6Re2mK9r4=";
2828 };
29293030 extraConfigureFlags = [
···7474 (prev: {
7575 MOZ_DATA_REPORTING = "";
7676 MOZ_TELEMETRY_REPORTING = "";
7777-7878- # Upstream already includes some of the bugfix patches that are applied by
7979- # `buildMozillaMach`. Pick out only the relevant ones for Floorp and override
8080- # the list here.
8181- patches = [
8282- ../firefox/env_var_for_system_dir-ff111.patch
8383- ../firefox/no-buildconfig-ffx121.patch
8484- ];
8577 })
-4
pkgs/build-support/vm/default.nix
···176176 fi
177177 source $stdenv/setup
178178179179- # Set the system time from the hardware clock. Works around an
180180- # apparent KVM > 1.5.2 bug.
181181- ${util-linux}/bin/hwclock -s
182182-183179 export NIX_STORE=${storeDir}
184180 export NIX_BUILD_TOP=/tmp
185181 export TMPDIR=/tmp
···3030 urls = [
3131 "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
3232 # Upstream removes downloads of older versions, please save bumped versions to archive.org
3333- # 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
3434- # https://blog.archive.org/2024/10/21/internet-archive-services-update-2024-10-21/
3333+ "https://web.archive.org/web/20241121002213/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
3534 ];
3635 hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o=";
3736 };