Commit graph

121 commits

Author SHA1 Message Date
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
jopejoe1
dca7e827b3
nixos: Replace custom cfg format handling with pkgs.formats (#314933) 2025-03-14 21:08:14 +01:00
Christoph Honal
94a66f9416 nixos/vsmartcard-vcpd: init 2025-02-15 22:16:31 +01:00
Sandro
b70ee4bd2e
nixos/jupyter: fix typos 2025-01-14 16:21:47 +01:00
Maximilian Ehlers
f199d57ad6
nixos/jupyter: migrate service to jupyter 7 setup (#367106)
Signed-off-by: Maximilian Ehlers <maximilian@sodawa.com>
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
2025-01-05 22:37:25 +05:30
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Felix Buehler
e8df83b3d2 nixos/services.gemstash: remove with lib; 2024-12-08 13:21:52 +01:00
Felix Buehler
2a63acaac6 nixos/services.bloop: remove with lib; 2024-12-08 13:21:52 +01:00
nicoo
429f89688a nixos/athens: Replace custom jq-based runCommand with pkgs.formats 2024-12-04 20:50:45 +00:00
Jakub Kozłowski
ccca341011
bloop: fix service (#358951) 2024-11-26 13:59:49 +01:00
Evgeny Kurnevsky
87647a1bf9
bloop: fix service
bloop uses 'start' command now which starts daemon in the background
2024-11-25 11:40:46 +01:00
netali
f41f218e0d
nixos/zammad: refactor module 2024-11-24 14:42:43 +01:00
Paul Meyer
ed5d274df7 nixos/athens: update docs
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2024-11-11 11:42:08 +01:00
Jack Wilsdon
df03b32278 nixos/jupyter: set user primary group 2024-10-17 23:44:53 +01:00
Paul Meyer
6e839b8f99 go_1_21/buildGo121Module: remove
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2024-10-01 12:43:42 +02:00
Aos Dabbagh
44a4c266c3 doc(livebook): Fix small spelling mistake 2024-09-16 14:54:45 -04:00
Felix Bühler
8dd85c637c
nixos/services.zammad: remove with lib; (#338051) 2024-09-02 21:42:59 +02:00
Felix Bühler
48e082adea
nixos/services.athens: remove with lib; (#338050) 2024-08-30 01:23:05 +02:00
Felix Buehler
45bc5974dd nixos/services.rstudio-server: remove with lib; 2024-08-30 00:30:45 +02:00
Felix Buehler
f65c35866a nixos/services.livebook: remove with lib; 2024-08-30 00:30:45 +02:00
Felix Buehler
df4401eac8 nixos/services.jupyterhub: remove with lib; 2024-08-30 00:30:45 +02:00
Felix Buehler
a986e3c10a nixos/services.jupyter.kernels: remove with lib; 2024-08-30 00:30:45 +02:00
Felix Buehler
5134f4b55c nixos/services.jupyter: remove with lib; 2024-08-30 00:30:44 +02:00
Felix Buehler
25ddce8617 nixos/services.hoogle: remove with lib; 2024-08-30 00:30:44 +02:00
Felix Buehler
8ddfb1375f nixos/services.distccd: remove with lib; 2024-08-30 00:30:44 +02:00
Felix Buehler
b16581f094 nixos/services.zammad: remove with lib; 2024-08-29 00:37:13 +02:00
Felix Buehler
0717502d60 nixos/services.athens: remove with lib; 2024-08-29 00:23:33 +02:00
Alexandru Scvortov
742ee97845 livebook: fix service not starting when LIVEBOOK_COOKIE was not set 2024-07-25 17:17:41 +01:00
Alexandru Scvortov
f147a306d5 livebook: add munksgaard and scvalex as maintainers 2024-07-25 17:17:41 +01:00
stuebinm
6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Bjørn Forsman
a29010fe79 nixos: improve many 'enable' descriptions 2024-04-09 07:10:17 +02:00
Janne Heß
fcc95ff817 treewide: Fix all Nix ASTs in all markdown files
This allows for correct highlighting and maybe future automatic
formatting. The AST was verified to work with nixfmt only.
2024-03-28 09:28:12 +01:00
Janne Heß
bc77c7a973 treewide: Mark Nix blocks in markdown as Nix
This should help us with highlighting and future formatting.
2024-03-28 09:28:12 +01:00
DCsunset
38261d9556 nixos/hoogle: add extraOptions 2024-03-06 22:12:41 -05:00
V
ff990ea66a nixos/nixseparatedebuginfod: fix compatibility with Nix 2.3
Appending to options with the `extra-` prefix was added in Nix 2.4,
which makes config validation fail on this version without the guard.

Change-Id: Ie253978dbaf00b228fecc08698a3dcc01cd2d82b
2024-02-29 23:10:31 +01:00
Sandro
7fab1e2013
Merge pull request #275024 from jerith666/lorri-less-protected 2024-02-24 16:07:13 +01:00
Philip Munksgaard
1ee8e72834
livebook: Set KillMode=mixed
This will gracefully shut down the service instead of resulting in errors like
this:

```
Jan 24 10:11:11 foo livebook[981676]: 10:11:11.922 [error] GenServer :disksup terminating
Jan 24 10:11:11 foo livebook[981676]: ** (stop) {:port_died, :normal}
Jan 24 10:11:11 foo livebook[981676]: Last message: {:EXIT, #Port<0.8>, :normal}
Jan 24 10:11:11 foo livebook[981676]: 10:11:11.922 [error] GenServer :memsup terminating
Jan 24 10:11:11 foo livebook[981676]: ** (stop) {:port_died, :normal}
```
2024-01-26 20:19:49 +01:00
Philip Munksgaard
897d5670a3
livebook: Use mix release to build instead of escript
The current build of livebook does not work with the new [Livebook
Teams](https://livebook.dev/teams/) features. The problem can be observed by
running the current version of livebook, adding a new team and going to the team
page. The process will crash and the team page will show a 500 error.

The base of the problem is that the escript build method is not officially
supported. This commit changes the livebook package to use the `mix release`
workflow, which is also the one used to build the official Docker container.

Unfortunately, the binary built with `mix release` does not support command line
arguments like the `escript` binary does. Instead, users need to pass in most of
the configuration as environment variables, as documented
[here](https://hexdocs.pm/livebook/readme.html#environment-variables). As a
result, this commit also changes the Livebook service to reflect this new way of
configuring Livebook.

Finally, the Livebook release configuration specifically excludes the
ERTS (Erlang Runtime System), which means that the resulting release cannot run
without Erlang installed.

I have tested the results (both of the package and the service) locally.
2024-01-26 20:19:46 +01:00
Guillaume Girol
db0f76e8c9
Merge pull request #271030 from symphorien/nixseparatedebuginfod
nixseparatedebuginfod: init at 0.3.0, plus module and nixos test
2024-01-07 17:45:13 +01:00
Guillaume Girol
dece72548e nixseparatedebuginfod: add module and nixos test 2024-01-01 13:42:13 +01:00
Alexandru Scvortov
0ae9c34391 livebook: configurable package and extraPackages
Also fix examples to not include a semicolon in the .env file.
2023-12-25 21:47:14 +00:00
Matt McHenry
db64f7f737 lorri.service: remove ProtectHome, relax ProtectSystem
per lorri's readme:

  lorri creates an indirect garbage collection root for each .drv in
  $XDG_CACHE_HOME/lorri (~/.cache/lorri/ by default) each time it
  evaluates your project.

... so it doesn't make sense to have ProtectHome enabled for
lorri.service.  lorri also needs to be able to modify
/nix/var/nix/gcroots/per-user/, so ProtectSystem can't be 'strict';
'full' is the next strongest.

fixes:

lorri: ERRO IO error binding to socket: Read-only file system (os error 30)

bisecting this error leads to a range of unbuildable commits including
'a314291652 Merge pull request #243242 from
RaitoBezarius/systemd-254', so it's likely that systemd update changed
the behaviour of ProtectHome somehow (though the release notes don't
have any obvious culprits).
2023-12-17 11:35:48 -05:00
Janik
7703f36fd1
Merge pull request #269469 from NetaliDev/zammad-update 2023-12-05 09:29:51 +01:00
netali
a1f6e1d6f1
nixos/zammad: update for zammad 6.1 2023-12-04 23:10:07 +01:00
Weijia Wang
feeae486de
Merge pull request #261702 from h7x4/replace-mkoption-with-mkpackageoption
treewide: use `mkPackageOption`
2023-11-30 02:49:30 +01:00
Emily Trau
77cc213d14
Merge pull request #265349 from malt3/init/athens
athens: init at 0.12.1
2023-11-29 18:28:39 +11:00
h7x4
0a37316d6c
treewide: use mkPackageOption
This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.
2023-11-27 01:28:36 +01:00
Maximilian Bosch
48459567ae nixos/postgresql: drop ensurePermissions, fix ensureUsers for postgresql15
Closes #216989

First of all, a bit of context: in PostgreSQL, newly created users don't
have the CREATE privilege on the public schema of a database even with
`ALL PRIVILEGES` granted via `ensurePermissions` which is how most of
the DB users are currently set up "declaratively"[1]. This means e.g. a
freshly deployed Nextcloud service will break early because Nextcloud
itself cannot CREATE any tables in the public schema anymore.

The other issue here is that `ensurePermissions` is a mere hack. It's
effectively a mixture of SQL code (e.g. `DATABASE foo` is relying on how
a value is substituted in a query. You'd have to parse a subset of SQL
to actually know which object are permissions granted to for a user).

After analyzing the existing modules I realized that in every case with
a single exception[2] the UNIX system user is equal to the db user is
equal to the db name and I don't see a compelling reason why people
would change that in 99% of the cases. In fact, some modules would even
break if you'd change that because the declarations of the system user &
the db user are mixed up[3].

So I decided to go with something new which restricts the ways to use
`ensure*` options rather than expanding those[4]. Effectively this means
that

* The DB user _must_ be equal to the DB name.
* Permissions are granted via `ensureDBOwnerhip` for an attribute-set in
  `ensureUsers`. That way, the user is actually the owner and can
  perform `CREATE`.
* For such a postgres user, a database must be declared in
  `ensureDatabases`.

For anything else, a custom state management should be implemented. This
can either be `initialScript`, doing it manual, outside of the module or
by implementing proper state management for postgresql[5], but the
current state of `ensure*` isn't even declarative, but a convergent tool
which is what Nix actually claims to _not_ do.

Regarding existing setups: there are effectively two options:

* Leave everything as-is (assuming that system user == db user == db
  name): then the DB user will automatically become the DB owner and
  everything else stays the same.

* Drop the `createDatabase = true;` declarations: nothing will change
  because a removal of `ensure*` statements is ignored, so it doesn't
  matter at all whether this option is kept after the first deploy (and
  later on you'd usually restore from backups anyways).

  The DB user isn't the owner of the DB then, but for an existing setup
  this is irrelevant because CREATE on the public schema isn't revoked
  from existing users (only not granted for new users).

[1] not really declarative though because removals of these statements
    are simply ignored for instance: https://github.com/NixOS/nixpkgs/issues/206467
[2] `services.invidious`: I removed the `ensure*` part temporarily
    because it IMHO falls into the category "manage the state on your
    own" (see the commit message). See also
    https://github.com/NixOS/nixpkgs/pull/265857
[3] e.g. roundcube had `"DATABASE ${cfg.database.username}" = "ALL PRIVILEGES";`
[4] As opposed to other changes that are considered a potential fix, but
    also add more things like collation for DBs or passwords that are
    _never_ touched again when changing those.
[5] As suggested in e.g. https://github.com/NixOS/nixpkgs/issues/206467
2023-11-13 17:16:25 +01:00
Malte Poll
9c5825bd27 nixos/athens: init at 0.12.1
Co-authored-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2023-11-07 14:43:11 +01:00
Alexandru Scvortov
fa54eeea5c livebook: add systemd user service, test, and docs
Co-authored-by: Yt <happysalada@tuta.io>
2023-10-31 07:31:18 +00:00