Skip to content

nix flake update: nixos-26.05!#352

Merged
24apricots merged 18 commits into
mainfrom
nixos-26.05
Jun 2, 2026
Merged

nix flake update: nixos-26.05!#352
24apricots merged 18 commits into
mainfrom
nixos-26.05

Conversation

@24apricots

@24apricots 24apricots commented May 27, 2026

Copy link
Copy Markdown
Member

starting a ci build and warming up our cache in preparation. still needs to be manually tested. we can merge after 26.05 is released :)

@24apricots

24apricots commented May 27, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

errors to fix:

warnings to fix:

  • why do we set the mpd listen address to 0.0.0.0 on tv? was this previously intended to be able to be accessed from lan before the firewall was re-enabled? (not introduced by pr and unrelated)
    evaluation warning: Using '0.0.0.0' as services.mpd.settings.bind_to_address without enabling services.mpd.openFirewall, might prevent you from accessing MPD from other clients. To suppress this warning, set services.mpd.openFirewall explicitly to false
  • linux-rpi (not going to bother for now, we dont use it)

other:

  • a lot of stuff is building from source that should not be building from source. we should check that we are not changing the dependency trees of packages for no reason in our various overlays

@24apricots

24apricots commented May 27, 2026

Copy link
Copy Markdown
Member Author

regarding openldap, i dont actually see a build on nixos hydra for i686-linux openldap, which is what our ci is failing to build. we dont need i686-linux though

This was referenced May 28, 2026
Closed
Closed
@24apricots

24apricots commented May 28, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

last time i tried to use dbus-broker instead of dbus-daemon, broker broke deployment on the desktops (#114). we should be careful about this as it is now default in 26.05.

@BNH440

BNH440 commented May 30, 2026

Copy link
Copy Markdown
Contributor

do I need to fix my cosmic-greeter overlay?

@24apricots

24apricots commented May 31, 2026

Copy link
Copy Markdown
Member Author

i fixed it for you, i just have not pushed it yet

24apricots added 8 commits June 1, 2026 06:40
@24apricots
nixos-26.05 prep: remove unmaintained neofetch, add hyfetch
6c374a9 
we already have fastfetch but im adding hyfetch since its a good edition and
should have already been added.

fixes the following error that occurs when updating to nixos-26.05:

error: 'neofetch' has been removed because it was unmaintained upstream.
Consider using the updated fork 'neowofetch' provided by the 'hyfetch' package
or the alternative 'fastfetch' instead.
@24apricots
nixos-26.05 prep: disable boot.zfs.forceImportRoot, rename supertuxkart
f7659dc 
fixes the following eval warnings that occurs when updating to nixos-26.05:

evaluation warning: 'superTuxKart' has been renamed to 'supertuxkart'
evaluation warning: `boot.zfs.forceImportRoot` is using the default value of `true`. It is highly recommended to set it to `false`, the new default from 26.11 on, to reduce the risk of data loss. Alternatively, you can silence this warning by explicitly setting it to `true`.
@24apricots
nixos-26.05 prep: add nvidia-kernel-modules to allowUnfreePredicate
269fff3 
fixes the following eval error that occurs when updating to nixos-26.05:

error: Refusing to evaluate package 'nvidia-kernel-modules-595.71.05-6.18.33'
@24apricots
nixos-26.05 prep: disable wayfire as dependency wf-config fails to build
1a5a5fd 
hydra builds failed for wf-config, which leads to it not being in the cache and
failing to build when nix tries to build locally.

fixes the following error that occurs when updating to nixos-26.05:

(build log cut off)
[23/33] Compiling C++ object test/option_test.p/option_test.cpp.o
ninja: build stopped: subcommand failed
@24apricots
nixos-26.05 prep: remove bitwarden-desktop as it uses eol electron
86f62da 
fixes the following eval error that occurs when updating to nixos-26.05:

error: Refusing to evaluate package 'electron-39.8.10'
@24apricots
flake.nix: add nixpkgs-deprecated and pkgsDeprecatedFor
1bdb75e 
will be useful for certain things that may temporarily need deprecated nixpkgs

added in preparation (but not exclusively) for updating to nixos-26.05
@24apricots
flake.nix: add a way to override nixpkgs for specific hosts
affa482 
- overridePkgsFor: similar to overrideSystem but for overriding nixpkgs for
  specific hosts.
- defaultPkgsFor: similar to defaultSystem but for setting the default pkgsFor
  function.

added in preparation (but not exclusively) for updating to nixos-26.05
@24apricots
flake.nix: add overlays to pkgsUnstableFor and pkgsDeprecatedFor
847e7d6
24apricots added 4 commits June 1, 2026 07:38
@24apricots
nix flake update: nixos-26.05!
3e5a5bb 
contains fixes for several errors that could not be fixed in a separate commit
without creating broken commits.

update from python312 to python314:
- also avoids build errors due to this bug, which seems to affect python312 but
  not python314:
  NixOS/nixpkgs#499166
- using python314 on 25.11 broke a lot of hosts, but it works well on 26.05

RFC42: these options in 25.11 were migrated to their 26.05 equivalents:
- systemd.sleep.extraConfig -> systemd.sleep.settings.Sleep
- services.mpd.extraConfig -> services.mpd.settings

replace unmaintained helvum with crosspipe to fix:
- error: 'helvum' has been removed as it was unmaintained upstream and relied on
  a vulnerable dependency. Consider using 'crosspipe' instead.

remove ocf-cosmic-greeter cargoDeps override:
- the previous hash was outdated and caused a build failure after updating to
  26.05.
- it works on 26.05 without the cargoDeps override, unlike on 25.11.

keep scootaloo on nixos-25.11 with python 3.12:
  - python3.14-html5lib-1.1 and python3.14-rich-14.1.0 are broken on 25.11 but
    not 26.05.
  - matrix-appservice-discord is broken on 26.05 but not 25.11.
  - scootaloo needs all three of these packages, so scootaloo is on nixos 25.11
    with python 3.12.
@24apricots
remove nginx cve patch since nginx >= 1.30.1
e4a453b
@24apricots
revert to nixpkgs stable for k8s dependencies since go >= 1.26
22034ad 
"revert to stable nixpkgs once go version is > 1.26"
nixpkgs-unstable currently has go 1.26.3, so i am assuming this meant to say ">=
1.26". nixpkgs 26.05 has updated go from 1.25 (current version in nixpkgs 25.11)
to 1.26, so kubernetes can be built with nixpkgs stable now.
@24apricots
add comment explaining why we pin k8s version
e12226a
@24apricots

24apricots commented Jun 1, 2026

Copy link
Copy Markdown
Member Author

i will mark the merge commit to be deployed with boot instead of switch. using switch will be a terrible idea

@24apricots
24apricots marked this pull request as ready for review June 1, 2026 15:35
sophiebsw
sophiebsw previously approved these changes Jun 1, 2026
View reviewed changes

@sophiebsw sophiebsw left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgbt (lgtm but it's pride month)

left some comments that are mostly clarification for myself (and one request that's arguably out of scope of this branch), feel free to resolve

Comment thread hosts/misc/termites.nix
Comment thread modules/printhost/monitor.nix
Comment thread flake.nix Outdated
Comment thread flake.nix Outdated
24apricots added 2 commits June 1, 2026 09:28
@24apricots
flake.nix: add hostDefaults and hostOverrides
3d7c3c3 
- hostDefaults and hostOverrides:
  - hostOverrides contains attributes that override hostDefaults for each
    hostname.
  - replaces the following with a single unified interface:
    - defaultPkgsFor
    - overridePkgsFor
    - defaultSystem
    - overrideSystem

- pkgsFor:
  - takes in a host from hostOverrides and returns the pkgs set for the given
    nixpkgs input and system architecture.
  - replaces the following with a single unified interface:
    - pkgsStableFor
    - pkgsDeprecatedFor
    - pkgsUnstableFor
    - pkgsForOverrideSystems
    - pkgsForOverridePkgs

the result is a lot nicer to read and parse :)
@24apricots
flake.nix: allow nixpkgs import config to be overrided per host
1a6ce9c
24apricots added 3 commits June 1, 2026 09:28
@24apricots
gh actions: specify deploy action with Deploy-action git trailer
ea08bb8 
- adds support for specifying the colmena deploy action with the git trailer:
  "Deploy-action: <valid action here>"
- defaults to switch when the specified action is invalid or the trailer is not
  there.
- only applies when the trailer is on HEAD inside the actions checkout.

this is very useful when we want a push to main to only apply after a reboot,
for example :)
@24apricots
printhost: use ocf.python.package
61b7330
@24apricots
flake.nix: use inherit more
16ac5a0
@24apricots

24apricots commented Jun 1, 2026

Copy link
Copy Markdown
Member Author

had to add a 2 character fixup, so i autosquashed it and force pushed

sophiebsw
sophiebsw previously approved these changes Jun 1, 2026
View reviewed changes
@24apricots
flake.nix: add pkgs-stable to specialArgs
4b47a5b 
even if stable is the default, an overridden host may still want to access
pkgs-stable as a specialArg
@24apricots 24apricots mentioned this pull request Jun 1, 2026
Closed
@24apricots
24apricots merged commit 447ae8b into main Jun 2, 2026
3 checks passed
@24apricots
24apricots deleted the nixos-26.05 branch June 2, 2026 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sophiebsw sophiebsw sophiebsw approved these changes
@BNH440 BNH440 BNH440 approved these changes
@jaysa68 jaysa68 Awaiting requested review from jaysa68

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@24apricots @BNH440 @sophiebsw