colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2025-08-05 -> 2025-08-06

Browse Source
This commit is contained in:
Colin
2025-08-06 22:11:52 +00:00
parent 8dbb2fdbe3
commit c4ae9d9e25
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/by-name/servo/services/prosody/default.nix
View File

@@ -173,7 +173,7 @@ in
domain = "conference.xmpp.uninsane.org"; domain = "conference.xmpp.uninsane.org";
} }
]; ];
uploadHttp.domain = "upload.xmpp.uninsane.org"; httpFileShare.domain = "upload.xmpp.uninsane.org";
virtualHosts = { virtualHosts = {
# "Prosody requires at least one enabled VirtualHost to function. You can # "Prosody requires at least one enabled VirtualHost to function. You can

2
hosts/modules/hal/aarch64.nix
View File

@@ -26,7 +26,7 @@ in
# TODO: upstream into nixpkgs. <repo:nixos/nixpkgs:pkgs/os-specific/linux/kernel/common-config.nix> # TODO: upstream into nixpkgs. <repo:nixos/nixpkgs:pkgs/os-specific/linux/kernel/common-config.nix>
name = "fix-module-builtin-mismatch"; name = "fix-module-builtin-mismatch";
patch = null; 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` # nixpkgs specifies `SUN8I_DE2_CCU = yes`, but that in turn requires `SUNXI_CCU = yes` and NOT `= module`
# symptom: config fails to eval # symptom: config fails to eval
SUNXI_CCU = yes; SUNXI_CCU = yes;

2
hosts/modules/hal/pine64-pinephone-pro/default.nix
View File

@@ -78,7 +78,7 @@ in
{ {
name = "enable-libcamera-requirements"; name = "enable-libcamera-requirements";
patch = null; 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 # 2024-11-28: speculatively enable these options which postmarketOS enabled, hoping they'll fixup libcamera/Snapshot app
# - <https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5084/diffs> # - <https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5084/diffs>
# - <https://gitlab.com/postmarketOS/pmaports/-/issues/2787> # - <https://gitlab.com/postmarketOS/pmaports/-/issues/2787>

18
pkgs/by-name/linux-armbian/package.nix
View File

@@ -529,7 +529,7 @@ linux.override {
# { # {
# name = "fix-compilation-specific-to-megi"; # name = "fix-compilation-specific-to-megi";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# ### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES # ### BUILD FIXES, NOT SPECIFIC TO MY PREFERENCES
# # # #
# # disabling the sun5i_eink driver avoids this compilation error: # # 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. # this could be enabled for *all* systems, but i'm not sure i really want that.
name = "quality-of-life"; name = "quality-of-life";
patch = null; patch = null;
extraStructuredConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
# optimize for faster builds (measured 12m00s -> 10m45s) # optimize for faster builds (measured 12m00s -> 10m45s)
# see <repo:kernel.org/linux:Documentation/admin-guide/quickly-build-trimmed-linux.rst> # see <repo:kernel.org/linux:Documentation/admin-guide/quickly-build-trimmed-linux.rst>
# note that several options can re-enable DEBUG_KERNEL (such as DEBUG_LIST) # note that several options can re-enable DEBUG_KERNEL (such as DEBUG_LIST)
@@ -573,7 +573,7 @@ linux.override {
{ {
name = "fix-no-display"; name = "fix-no-display";
patch = null; patch = null;
extraStructuredConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
### RUNTIME FIXES AFTER <https://github.com/NixOS/nixpkgs/pull/298332> ### RUNTIME FIXES AFTER <https://github.com/NixOS/nixpkgs/pull/298332>
# pmOS kernel config is in pmaports repo: # pmOS kernel config is in pmaports repo:
# - CONFIG_FB_SIMPLE=y # - CONFIG_FB_SIMPLE=y
@@ -593,7 +593,7 @@ linux.override {
{ {
name = "enable-megi-modem-power"; name = "enable-megi-modem-power";
patch = null; patch = null;
extraStructuredConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
# enable /sys/class/modem-power, a thing specific to Megi's kernel/patches # enable /sys/class/modem-power, a thing specific to Megi's kernel/patches
MODEM_POWER = module; MODEM_POWER = module;
}; };
@@ -602,13 +602,13 @@ linux.override {
# { # {
# name = "nixpkgs-config"; # name = "nixpkgs-config";
# patch = null; # patch = null;
# extraStructuredConfig = linux_latest.commonStructuredConfig; # structuredExtraConfig = linux_latest.commonStructuredConfig;
# } # }
] ++ lib.optionals usePmosConfig [ ] ++ lib.optionals usePmosConfig [
{ {
name = "postmarketos-config"; name = "postmarketos-config";
patch = null; patch = null;
extraStructuredConfig = builtins.removeAttrs structuredExtraConfig = builtins.removeAttrs
(sane-kernel-tools.parseDefconfigStructuredNonempty linux-postmarketos-allwinner.defconfigStr) (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 # 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"; name = "enable options for Pinephone";
patch = null; 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 defaults to `n` since the driver is in staging (as of 2024-09-18)
VIDEO_SUNXI = yes; VIDEO_SUNXI = yes;
# VIDEO_SUNXI_CEDRUS = module; #< implied by VIDEO_SUNXI # VIDEO_SUNXI_CEDRUS = module; #< implied by VIDEO_SUNXI
@@ -835,7 +835,7 @@ linux.override {
# { # {
# name = "enable options for libcamera development"; # name = "enable options for libcamera development";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# # borrowed from postmarketOS, "to enable libcamera development" # # borrowed from postmarketOS, "to enable libcamera development"
# # pmaports commit f18c7210ab # # pmaports commit f18c7210ab
# # DMABUF_HEAPS = yes; # # DMABUF_HEAPS = yes;
@@ -857,7 +857,7 @@ linux.override {
{ {
name = "enable-rtw88-wifi-drivers"; name = "enable-rtw88-wifi-drivers";
patch = null; patch = null;
extraStructuredConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
# default nixpkgs/pmos config enables RTW88, but not RTW88_8723CS. # default nixpkgs/pmos config enables RTW88, but not RTW88_8723CS.
# but the pinephone uses a 8723BS/8723CS chipset, so enable these # but the pinephone uses a 8723BS/8723CS chipset, so enable these
# and anything else that could possibly be needed, since these things are tangled. # and anything else that could possibly be needed, since these things are tangled.

2
pkgs/by-name/linux-megous/package.nix
View File

@@ -366,7 +366,7 @@ let
# # - https://discourse.nixos.org/t/the-correct-way-to-override-the-latest-kernel-config/533/9 # # - https://discourse.nixos.org/t/the-correct-way-to-override-the-latest-kernel-config/533/9
# name = "linux-megous-defconfig"; # name = "linux-megous-defconfig";
# patch = null; # patch = null;
# extraStructuredConfig = config; # structuredExtraConfig = config;
# }; # };
in ((buildLinux { in ((buildLinux {

18
pkgs/by-name/linux-sane-pinephonepro/package.nix
View File

@@ -23,7 +23,7 @@ linux_latest.override {
# { # {
# name = "pmos-config"; # name = "pmos-config";
# patch = null; # patch = null;
# extraStructuredConfig = builtins.removeAttrs # structuredExtraConfig = builtins.removeAttrs
# linux-postmarketos-pinephonepro.structuredConfig # linux-postmarketos-pinephonepro.structuredConfig
# [ # [
# "BASE_SMALL" # pmos: =0 ??? # "BASE_SMALL" # pmos: =0 ???
@@ -67,7 +67,7 @@ linux_latest.override {
# { # {
# name = "add-removed"; # name = "add-removed";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# DRM_PANEL_HIMAX_HX8394 = module; # DRM_PANEL_HIMAX_HX8394 = module;
# DRM_PANEL_SIMPLE = module; # DRM_PANEL_SIMPLE = module;
# }; # };
@@ -77,7 +77,7 @@ linux_latest.override {
# necessary only if `preferBuiltin = false` # necessary only if `preferBuiltin = false`
name = "fix-module-only"; name = "fix-module-only";
patch = null; patch = null;
extraStructuredConfig = with lib.kernel; { structuredExtraConfig = with lib.kernel; {
SUN8I_DE2_CCU = lib.mkForce module; SUN8I_DE2_CCU = lib.mkForce module;
}; };
} }
@@ -85,7 +85,7 @@ linux_latest.override {
# { # {
# name = "upgrade-builtins-to-module"; # name = "upgrade-builtins-to-module";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# CPU_FREQ_GOV_CONSERVATIVE = yes; # CPU_FREQ_GOV_CONSERVATIVE = yes;
# CPUFREQ_DT = yes; # CPUFREQ_DT = yes;
# CPUFREQ_DT_PLATDEV = yes; # CPUFREQ_DT_PLATDEV = yes;
@@ -127,7 +127,7 @@ linux_latest.override {
{ {
name = "misc-hw-fixes"; name = "misc-hw-fixes";
patch = null; 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: # 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 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) 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"; # name = "reset-nixpkgs-overrides";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# # this is required for boot (but why??) # # this is required for boot (but why??)
# ACPI_FPDT = lib.mkForce no; # ACPI_FPDT = lib.mkForce no;
@@ -191,7 +191,7 @@ linux_latest.override {
# # smallest observed non-bootable image: 71297536B # # smallest observed non-bootable image: 71297536B
# name = "optimize-for-size"; # name = "optimize-for-size";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE = no; # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE = no;
# CONFIG_CC_OPTIMIZE_FOR_SIZE = yes; # CONFIG_CC_OPTIMIZE_FOR_SIZE = yes;
@@ -252,7 +252,7 @@ linux_latest.override {
# { # {
# name = "reset-automodules-overrides"; # name = "reset-automodules-overrides";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# # NR_CPUS = lib.mkForce (freeform "64"); # # NR_CPUS = lib.mkForce (freeform "64");
# # RANDOM_KMALLOC_CACHES = lib.mkForce no; # # RANDOM_KMALLOC_CACHES = lib.mkForce no;
# # HOTPLUG_PCI_PCIE = 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. # # so just don't build these here, and rely wholly on my out-of-tree modules.
# name = "make-module-for-out-of-tree"; # name = "make-module-for-out-of-tree";
# patch = null; # patch = null;
# extraStructuredConfig = with lib.kernel; { # structuredExtraConfig = with lib.kernel; {
# # MFD_RK8XX = no; # # MFD_RK8XX = no;
# # MFD_RK8XX_I2C = no; # # MFD_RK8XX_I2C = no;
# # MFD_RK8XX_SPI = no; #< necessary for MFD_RK8XX=... to apply # # MFD_RK8XX_SPI = no; #< necessary for MFD_RK8XX=... to apply

6
pkgs/by-name/nixpkgs-bootstrap/master.nix
View File

@@ -14,8 +14,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "b65adef5fe1f68db0bbd27dbb1d5f779805c2b8b"; rev = "c2ae88e026f9525daf89587f3cbee584b92b6134";
sha256 = "sha256-P+QnQOEh8n+4terom/1ZijQYgv4SnrFLfRzIcFzT1MI="; sha256 = "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=";
version = "unstable-2025-08-05"; version = "unstable-2025-08-06";
branch = "master"; branch = "master";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "fc10bffd8eea7cd24f73ea2be7c38a1ff549dcc1"; rev = "5da2bc6cb2ef285e10507d34d0481658cfca8f45";
sha256 = "sha256-vLEx/DDT+IWB0zGX4Le5Fsic3rCuq2jZtAeespjWBqY="; sha256 = "sha256-E6fJqlTrOWmMS1rjfWF1uwcYWHU3gAXK2C6xmTPx6Ew=";
version = "unstable-2025-08-05"; version = "unstable-2025-08-06";
branch = "staging-next"; branch = "staging-next";
} }

6
pkgs/by-name/nixpkgs-bootstrap/staging.nix
View File

@@ -2,8 +2,8 @@
mkNixpkgs ? import ./mkNixpkgs.nix {}, mkNixpkgs ? import ./mkNixpkgs.nix {},
}: }:
mkNixpkgs { mkNixpkgs {
rev = "08861d03f89a3d908f49a9e64bdc8d7be7c1a7bf"; rev = "13e07277976e41011caf25fe62201e9fb6de29df";
sha256 = "sha256-jCDhpGW2ZI6B9FCzmXuv30/A24ld20vjxwX5MPK4FLE="; sha256 = "sha256-aYWjNYBfusR2CMhKNOWhQ1CDsqS+Yc6xvmdTNSZP/0Q=";
version = "unstable-2025-08-05"; version = "unstable-2025-08-06";
branch = "staging"; branch = "staging";
} }

2
pkgs/by-name/sane-kernel-tools/package.nix
View File

@@ -22,7 +22,7 @@ lib.makeScope newScope (self: with self; {
# parseDefconfig: given the entire text of a defconfig file # parseDefconfig: given the entire text of a defconfig file
# parse it into an attrset usable by the nixpkgs kernel config tools. # 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"; }` # results are like ` { CONFIG_FOO = "y"; CONFIG_FOO_BAR = "128"; }`
parseDefconfig = wholeStr: let parseDefconfig = wholeStr: let
lines = lib.splitString "\n" wholeStr; lines = lib.splitString "\n" wholeStr;