cockpit: 330 -> 331

[lucasew]

Fixes: #367053

• cockpit: 330 -> 331
• tests/cockpit: each wait with its own waiter, treat /nonexistent case

Basically, cockpit was having some FHS assuming issues. This PR bumps to the latest version and fixes them.

When merged, this should be backported because stable is also broken.

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[lucasew]

The new iteration is just nixfmt

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/cockpit-dashboard-management-interface-package-does-not-work-properly/57403/16

[GaetanLepage]

Can you try adding versionCheckHook (see typst/package.nix for an example) ?

Also, for meta:

• remove with lib;,
• Add `changelog = "https://cockpit-project.org/blog/cockpit-${finalAttrs.version}.html";

I haven't looked at the module.

[GaetanLepage]

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 368886

---

x86_64-linux

⏩ 2 packages blacklisted:

• nixos-install-tools
• tests.nixos-functions.nixos-test

✅ 1 package built:

• cockpit

---

aarch64-linux

⏩ 2 packages blacklisted:

• nixos-install-tools
• tests.nixos-functions.nixos-test

✅ 1 package built:

• cockpit

[GaetanLepage]

LGTM

[GaetanLepage]

I trust you on the nixos module aspect

[GaetanLepage]

Thanks for addressing all my comments :)

[lucasew]

Going to backport this as the stable version is also broken

[nixpkgs-ci]

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-368886-to-release-24.11 origin/release-24.11
cd .worktree/backport-368886-to-release-24.11
git switch --create backport-368886-to-release-24.11
git cherry-pick -x b06a23a6148f79c5fdf806655319472f7313b9c4 44812cdb98d87f011caaad847cca46f071a74c59 af9751f3fcdca851d822f5ca0c8a725fe98d4cb7

[lucasew]

Backport PR #369266