From c4ae9d9e253a58afbe684dbc5c8ff87e32f37a4d Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 6 Aug 2025 22:11:52 +0000 Subject: [PATCH] nixpkgs: 2025-08-05 -> 2025-08-06 --- .../by-name/servo/services/prosody/default.nix | 2 +- hosts/modules/hal/aarch64.nix | 2 +- .../hal/pine64-pinephone-pro/default.nix | 2 +- pkgs/by-name/linux-armbian/package.nix | 18 +++++++++--------- pkgs/by-name/linux-megous/package.nix | 2 +- .../linux-sane-pinephonepro/package.nix | 18 +++++++++--------- pkgs/by-name/nixpkgs-bootstrap/master.nix | 6 +++--- .../by-name/nixpkgs-bootstrap/staging-next.nix | 6 +++--- pkgs/by-name/nixpkgs-bootstrap/staging.nix | 6 +++--- pkgs/by-name/sane-kernel-tools/package.nix | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/hosts/by-name/servo/services/prosody/default.nix b/hosts/by-name/servo/services/prosody/default.nix index 982bc5ca5..35f1ec9a0 100644 --- a/hosts/by-name/servo/services/prosody/default.nix +++ b/hosts/by-name/servo/services/prosody/default.nix @@ -173,7 +173,7 @@ in domain = "conference.xmpp.uninsane.org"; } ]; - uploadHttp.domain = "upload.xmpp.uninsane.org"; + httpFileShare.domain = "upload.xmpp.uninsane.org"; virtualHosts = { # "Prosody requires at least one enabled VirtualHost to function. You can diff --git a/hosts/modules/hal/aarch64.nix b/hosts/modules/hal/aarch64.nix index 8eabb80f6..8e7c94552 100644 --- a/hosts/modules/hal/aarch64.nix +++ b/hosts/modules/hal/aarch64.nix @@ -26,7 +26,7 @@ in # TODO: upstream into nixpkgs. name = "fix-module-builtin-mismatch"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # nixpkgs specifies `SUN8I_DE2_CCU = yes`, but that in turn requires `SUNXI_CCU = yes` and NOT `= module` # symptom: config fails to eval SUNXI_CCU = yes; diff --git a/hosts/modules/hal/pine64-pinephone-pro/default.nix b/hosts/modules/hal/pine64-pinephone-pro/default.nix index 11999943d..a0615fc91 100644 --- a/hosts/modules/hal/pine64-pinephone-pro/default.nix +++ b/hosts/modules/hal/pine64-pinephone-pro/default.nix @@ -78,7 +78,7 @@ in { name = "enable-libcamera-requirements"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # 2024-11-28: speculatively enable these options which postmarketOS enabled, hoping they'll fixup libcamera/Snapshot app # - # - diff --git a/pkgs/by-name/linux-armbian/package.nix b/pkgs/by-name/linux-armbian/package.nix index 7c9b3ed7a..12e76046b 100644 --- a/pkgs/by-name/linux-armbian/package.nix +++ b/pkgs/by-name/linux-armbian/package.nix @@ -529,7 +529,7 @@ linux.override { # { # name = "fix-compilation-specific-to-megi"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # ### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES # # # # disabling the sun5i_eink driver avoids this compilation error: @@ -547,7 +547,7 @@ linux.override { # this could be enabled for *all* systems, but i'm not sure i really want that. name = "quality-of-life"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # optimize for faster builds (measured 12m00s -> 10m45s) # see # note that several options can re-enable DEBUG_KERNEL (such as DEBUG_LIST) @@ -573,7 +573,7 @@ linux.override { { name = "fix-no-display"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { ### RUNTIME FIXES AFTER # pmOS kernel config is in pmaports repo: # - CONFIG_FB_SIMPLE=y @@ -593,7 +593,7 @@ linux.override { { name = "enable-megi-modem-power"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # enable /sys/class/modem-power, a thing specific to Megi's kernel/patches MODEM_POWER = module; }; @@ -602,13 +602,13 @@ linux.override { # { # name = "nixpkgs-config"; # patch = null; - # extraStructuredConfig = linux_latest.commonStructuredConfig; + # structuredExtraConfig = linux_latest.commonStructuredConfig; # } ] ++ lib.optionals usePmosConfig [ { name = "postmarketos-config"; patch = null; - extraStructuredConfig = builtins.removeAttrs + structuredExtraConfig = builtins.removeAttrs (sane-kernel-tools.parseDefconfigStructuredNonempty linux-postmarketos-allwinner.defconfigStr) ([ # remove attrs which nixpkgs wants to set for itself, only because the kernel config options are so fucked that i can't figure out how to override things without breaking eval @@ -674,7 +674,7 @@ linux.override { { name = "enable options for Pinephone"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # VIDEO_SUNXI defaults to `n` since the driver is in staging (as of 2024-09-18) VIDEO_SUNXI = yes; # VIDEO_SUNXI_CEDRUS = module; #< implied by VIDEO_SUNXI @@ -835,7 +835,7 @@ linux.override { # { # name = "enable options for libcamera development"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # # borrowed from postmarketOS, "to enable libcamera development" # # pmaports commit f18c7210ab # # DMABUF_HEAPS = yes; @@ -857,7 +857,7 @@ linux.override { { name = "enable-rtw88-wifi-drivers"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # default nixpkgs/pmos config enables RTW88, but not RTW88_8723CS. # but the pinephone uses a 8723BS/8723CS chipset, so enable these # and anything else that could possibly be needed, since these things are tangled. diff --git a/pkgs/by-name/linux-megous/package.nix b/pkgs/by-name/linux-megous/package.nix index d845a641a..1d0dce667 100644 --- a/pkgs/by-name/linux-megous/package.nix +++ b/pkgs/by-name/linux-megous/package.nix @@ -366,7 +366,7 @@ let # # - https://discourse.nixos.org/t/the-correct-way-to-override-the-latest-kernel-config/533/9 # name = "linux-megous-defconfig"; # patch = null; - # extraStructuredConfig = config; + # structuredExtraConfig = config; # }; in ((buildLinux { diff --git a/pkgs/by-name/linux-sane-pinephonepro/package.nix b/pkgs/by-name/linux-sane-pinephonepro/package.nix index adeab3e5b..74160b15d 100644 --- a/pkgs/by-name/linux-sane-pinephonepro/package.nix +++ b/pkgs/by-name/linux-sane-pinephonepro/package.nix @@ -23,7 +23,7 @@ linux_latest.override { # { # name = "pmos-config"; # patch = null; - # extraStructuredConfig = builtins.removeAttrs + # structuredExtraConfig = builtins.removeAttrs # linux-postmarketos-pinephonepro.structuredConfig # [ # "BASE_SMALL" # pmos: =0 ??? @@ -67,7 +67,7 @@ linux_latest.override { # { # name = "add-removed"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # DRM_PANEL_HIMAX_HX8394 = module; # DRM_PANEL_SIMPLE = module; # }; @@ -77,7 +77,7 @@ linux_latest.override { # necessary only if `preferBuiltin = false` name = "fix-module-only"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { SUN8I_DE2_CCU = lib.mkForce module; }; } @@ -85,7 +85,7 @@ linux_latest.override { # { # name = "upgrade-builtins-to-module"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # CPU_FREQ_GOV_CONSERVATIVE = yes; # CPUFREQ_DT = yes; # CPUFREQ_DT_PLATDEV = yes; @@ -127,7 +127,7 @@ linux_latest.override { { name = "misc-hw-fixes"; patch = null; - extraStructuredConfig = with lib.kernel; { + structuredExtraConfig = with lib.kernel; { # XXX(2024-09-18): megapixels(-next) on OG PP fails to open the camera without this option: ARM64_VA_BITS_48 = yes; #< 48 (not 52) bits for virtual addresses. the other bit widths (ARM64_VA*, ARM64_PA_*, PGTABLE_LEVELS) are then derived/implied same as pmos config BACKLIGHT_CLASS_DEVICE = yes; #< required for display initialization on OG PP (adding "backlight" to initrd does not fix display) @@ -137,7 +137,7 @@ linux_latest.override { # { # name = "reset-nixpkgs-overrides"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # # this is required for boot (but why??) # ACPI_FPDT = lib.mkForce no; @@ -191,7 +191,7 @@ linux_latest.override { # # smallest observed non-bootable image: 71297536B # name = "optimize-for-size"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE = no; # CONFIG_CC_OPTIMIZE_FOR_SIZE = yes; @@ -252,7 +252,7 @@ linux_latest.override { # { # name = "reset-automodules-overrides"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # # NR_CPUS = lib.mkForce (freeform "64"); # # RANDOM_KMALLOC_CACHES = lib.mkForce no; # # HOTPLUG_PCI_PCIE = lib.mkForce no; @@ -385,7 +385,7 @@ linux_latest.override { # # so just don't build these here, and rely wholly on my out-of-tree modules. # name = "make-module-for-out-of-tree"; # patch = null; - # extraStructuredConfig = with lib.kernel; { + # structuredExtraConfig = with lib.kernel; { # # MFD_RK8XX = no; # # MFD_RK8XX_I2C = no; # # MFD_RK8XX_SPI = no; #< necessary for MFD_RK8XX=... to apply diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 9c57fdd08..78434043a 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -14,8 +14,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "b65adef5fe1f68db0bbd27dbb1d5f779805c2b8b"; - sha256 = "sha256-P+QnQOEh8n+4terom/1ZijQYgv4SnrFLfRzIcFzT1MI="; - version = "unstable-2025-08-05"; + rev = "c2ae88e026f9525daf89587f3cbee584b92b6134"; + sha256 = "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs="; + version = "unstable-2025-08-06"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index 3f48af85b..77bec95a7 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "fc10bffd8eea7cd24f73ea2be7c38a1ff549dcc1"; - sha256 = "sha256-vLEx/DDT+IWB0zGX4Le5Fsic3rCuq2jZtAeespjWBqY="; - version = "unstable-2025-08-05"; + rev = "5da2bc6cb2ef285e10507d34d0481658cfca8f45"; + sha256 = "sha256-E6fJqlTrOWmMS1rjfWF1uwcYWHU3gAXK2C6xmTPx6Ew="; + version = "unstable-2025-08-06"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index 82f9b86b5..9e3518ce9 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "08861d03f89a3d908f49a9e64bdc8d7be7c1a7bf"; - sha256 = "sha256-jCDhpGW2ZI6B9FCzmXuv30/A24ld20vjxwX5MPK4FLE="; - version = "unstable-2025-08-05"; + rev = "13e07277976e41011caf25fe62201e9fb6de29df"; + sha256 = "sha256-aYWjNYBfusR2CMhKNOWhQ1CDsqS+Yc6xvmdTNSZP/0Q="; + version = "unstable-2025-08-06"; branch = "staging"; } diff --git a/pkgs/by-name/sane-kernel-tools/package.nix b/pkgs/by-name/sane-kernel-tools/package.nix index 869f92a1f..37495c290 100644 --- a/pkgs/by-name/sane-kernel-tools/package.nix +++ b/pkgs/by-name/sane-kernel-tools/package.nix @@ -22,7 +22,7 @@ lib.makeScope newScope (self: with self; { # parseDefconfig: given the entire text of a defconfig file # parse it into an attrset usable by the nixpkgs kernel config tools. - # this is not meant for `extraStructuredConfig`, but stuff further downstream. + # this is not meant for `structuredExtraConfig`, but stuff further downstream. # results are like ` { CONFIG_FOO = "y"; CONFIG_FOO_BAR = "128"; }` parseDefconfig = wholeStr: let lines = lib.splitString "\n" wholeStr;