Skip to content

Conversation

@OulipianSummer
Copy link
Contributor

This MR extends the available config options for Drupal.

There is a new configSyncDir setting that allows users to define the location of the config sync dir.

There is also a new extraConfig setting that accepts raw PHP code that will be injected into the Drupal settings.php file. The settings that users write to both attributes will automatically be available to Drupal.

These changes help bring the Drupal service one step closer to being managed by the nix language and NixOS.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from b2e1d0f to cf6dedf Compare July 24, 2025 20:39
@nixpkgs-ci nixpkgs-ci bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 24, 2025
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from cf6dedf to 59f73fa Compare July 24, 2025 20:49
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 24, 2025
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from 15fbf94 to 5407596 Compare July 25, 2025 00:38
@OulipianSummer OulipianSummer marked this pull request as draft July 25, 2025 02:04
@OulipianSummer OulipianSummer changed the title Nixos drupal config extend nixos/drupal: config extend Jul 25, 2025
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from 5407596 to e6295a6 Compare July 25, 2025 14:13
@OulipianSummer
Copy link
Contributor Author

OulipianSummer commented Jul 25, 2025

@NixOS/nix-formatting I'm working on this PR and I can't seem to get the formatting and linting tests to pass.

I've run the following commands on my local, all within the root of nixpkgs, with the latest code from the master branch.

  • nix fmt
  • nix-shell --run treefmt
  • nix-shell -p nixfmt-tree && treefmt

None of them have yielded any changes to the files I'm working on, which seems to indicate the formatting is correct. I've even rebased my commit a few times to make sure that wasn't the culprit.

When using nix-shell, it looks like the version of treefmt that comes with nixfmt-tree is v2.3.1
I am running this using nix version 2.28.4.

The failures (at least according to the job logs) don't appear to be related to this package.

Any clue why this job keeps failing?

@jfly
Copy link
Contributor

jfly commented Jul 25, 2025

@OulipianSummer this is not your fault. I believe these checks run not on the code in your branch, but instead on your branch if it were merged.

With the nixfmt 1.0 upgrade, we recently changed our formatting rules, and now we have a bunch of PRs that are green from checks run before the upgrade. For example, your most recent CI failure complained about the formatting of pkgs/by-name/gi/git-spice/package.nix, which was just fixed in #428350.

I believe setting up github's merge queue is our plan to get PRs merged to main without breaking main. Until then, I guess we suffer. Unless there's some way to "expire" all these known stale checks?

@OulipianSummer
Copy link
Contributor Author

@jfly Thanks for that information. OK, I thought what I was looking at seemed unrelated, but it's good to know for sure. I've noticed that the logs have changed each time I push to this branch, so I assume this is sort of slowly getting resolved by other maintainers as we speak.

I guess my strategy right now will be to just wait for the formatting errors to get resolved and then re-open and rebase my branch when that happens. A merge train/queue does sound like the fix for the future, but as for the old stuff I don't know of a way to expire jobs. Unless you add a new merge job that runs nxmt on everything before it gets merged and then figure out what fails from that, but that might just make a bigger problem.

@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from e6295a6 to e0b8d5d Compare July 26, 2025 19:18
@OulipianSummer OulipianSummer marked this pull request as ready for review July 26, 2025 19:26
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 26, 2025
@OulipianSummer OulipianSummer requested a review from drupol July 28, 2025 17:19
@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 28, 2025
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from e0b8d5d to 950377a Compare July 28, 2025 21:39
@OulipianSummer OulipianSummer marked this pull request as draft July 28, 2025 21:46
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from 950377a to ab92e8b Compare July 29, 2025 18:35
@OulipianSummer OulipianSummer marked this pull request as ready for review July 29, 2025 18:47
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from ab92e8b to 5c3bf52 Compare July 31, 2025 15:50
@OulipianSummer OulipianSummer force-pushed the nixos-drupal-config-extend branch from 5c3bf52 to ed75819 Compare July 31, 2025 20:05
@drupol drupol merged commit 35d4463 into NixOS:master Aug 1, 2025
25 of 27 checks passed
@drupol
Copy link
Contributor

drupol commented Aug 1, 2025

Thanks, amazing stuff !

@OulipianSummer OulipianSummer deleted the nixos-drupal-config-extend branch August 1, 2025 03:21
@OulipianSummer
Copy link
Contributor Author

Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants