944 Commits

Author SHA1 Message Date
Martin Weinelt
6cba250893 Revert "Reapply "nixos/nixpkgs.config: make use of the module defined in config.nix"" 2026-05-10 20:27:56 +02:00
Johannes Kirschbauer
86cd4e7bc8 Reapply "nixos/nixpkgs.config: make use of the module defined in config.nix"
This reverts commit a06a6caa6b.
2026-05-07 19:11:47 +02:00
K900
a06a6caa6b Revert "nixos/nixpkgs.config: make use of the module defined in config.nix" 2026-05-07 15:38:29 +03:00
Robert Hensing
a0ffa8bf93 nixos/nixpkgs.config: make use of the module defined in config.nix (#489889) 2026-05-07 10:33:20 +00:00
Tom Hunze
9d34e429c2 nixos/xtreemfs: drop
xtreemfs has been broken since October 2025 [1] and has seen no upstream
changes since October 2024 [2].

[1] https://hydra.nixos.org/job/nixpkgs/unstable/xtreemfs.x86_64-linux/all
[2] https://github.com/xtreemfs/xtreemfs
2026-05-05 21:01:42 +02:00
Johannes Kirschbauer
1d1e96211e nixos/nixpkgs.config: use deferredModule to avoid double evaluation
Switch the option type to `deferredModuleWith`, which collects definitions without evaluating them.
The raw definitions are forwarded to nixpkgs function via a new internal `_configDefinitions` parameter.

`apply` on the option returns `finalPkgs.config`, preserving
backwards compatibility for external readers of `config.nixpkgs.config`
2026-05-04 10:05:11 +02:00
jopejoe1
169e69597b nixos/nixpkgs.config: make use of the module defined in config.nix
This makes it so that the `nixpkgs.config` options can be merged with the module system

It also makes the defined options show up in search and the manual.
2026-05-04 10:05:11 +02:00
Michael Daniels
2e87c2f8f4 nixos/*: remove unused let bindings
Generated using deadnix (with some manual work); split from #514611.
2026-05-01 20:39:14 -04:00
nixpkgs-ci[bot]
fe636a301d Merge master into staging-next 2026-04-17 06:39:17 +00:00
Tom Fitzhenry
55efd0620a tlshd: add modular service and test 2026-04-13 03:16:52 +00:00
nixpkgs-ci[bot]
63496be1d6 Merge master into staging-next 2026-04-12 00:29:50 +00:00
Tom Fitzhenry
b36d596602 nixos/documentation/modular-services: add snid
Oops, missed this in https://github.com/NixOS/nixpkgs/pull/507875.
2026-04-10 20:44:50 +10:00
nixpkgs-ci[bot]
01f34771b4 Merge staging-next into staging 2026-04-06 00:28:40 +00:00
Robert Hensing
1baf57f3a0 nixos/modules/docs: fix documentation build
Include the moved-out modular service infrastructure into the set of
files to evaluate during the docs build.
This was previously unnecessary because even the portable parts were
stored inside the nixos tree.
2026-04-04 11:24:24 +02:00
cinereal
a338deb8a1 lib/services: move portable service infrastructure out of nixos/
Move the portable modular service base from
nixos/modules/system/service/portable/ to lib/services/, making it
importable by any module system (home-manager, nix-darwin) without
reaching into the nixos/ tree.

Moved files: service.nix, lib.nix, config-data.nix, config-data-item.nix,
test.nix. All external references updated (systemd/system.nix,
doc/manual/default.nix, assertions.nix, README.md).

No functional changes - only import paths differ.
2026-04-04 08:23:23 +02:00
nixpkgs-ci[bot]
304c5f4649 Merge staging-next into staging 2026-04-02 18:19:01 +00:00
glyph
ecf281d03f ids: fix incorrect comment 2026-03-29 00:12:19 +01:00
Robert Hensing
647f7755c1 nixos/documentation: use structuredAttrs instead of passAsFile (#498927) 2026-03-23 13:35:32 +00:00
Stefan Frijters
74b44bcbf2 nixos/documentation: use structuredAttrs instead of passAsFile 2026-03-22 12:59:30 +01:00
Philip Taron
db36fea9ec nixos/documentation: remove unnecessary _file using __curPos
Move the inline modularServicesModule to a separate file so the module
system sets _file automatically from the file path, removing the need
for __curPos.
2026-03-19 11:45:37 -07:00
Lin Jian
a9bbe999f1 nixos/man-db: trigger mandb generation by multi-user.target
default.target is an alias[1] to either multi-user.target or
graphical.target.  It makes a bit more sense to trigger mandb
generation by multi-user.target since the generation does not depend
on graphics.

[1]: man bootup
2026-03-01 12:50:22 +08:00
Doron Behar
d3e5636b62 doc/documentation.man: use {.note} macro for man-db note
Followup to:

https://github.com/NixOS/nixpkgs/pull/488395#pullrequestreview-3850806387

Co-Authored-By: sandro.jaeckel@gmail.com
2026-02-26 17:25:56 +02:00
Gaute Ravndal
5d7f644094 nixos/man-db: add option to generate cache at runtime
Enables faster and fully asynchronous generation of the cache at runtime
by maintaining a separate copy of `cfg.manualPages` with appropriate
timestamps so that mandb can pick up relevant changes without having to
re-generate the full cache on nearly every system rebuild.
2026-02-19 15:46:27 +01:00
Gaute Ravndal
3fff19ce9c nixos/documentation: rename man.generateCaches to man.cache.enable 2026-02-19 15:16:02 +01:00
Yureka
918178a9c9 nixos/misc/nixpkgs add setting nixpkgs.config.allowUnfreePackages = ["list" "of" "packages"] (#396595) 2026-01-27 11:14:29 +00:00
Dyego Aurélio
28096cc5e3 treewide: apply nixfmt 1.2.0 2026-01-22 18:37:56 -03:00
NAHO
a2ed7e8d88 nixos: remove optional builtins prefixes from prelude functions
Remove optional builtins prefixes from prelude functions by running:

    builtins=(
      abort
      baseNameOf
      break
      derivation
      derivationStrict
      dirOf
      false
      fetchGit
      fetchMercurial
      fetchTarball
      fetchTree
      fromTOML
      import
      isNull
      map
      null
      placeholder
      removeAttrs
      scopedImport
      throw
      toString
      true
    )

    fd \
      --exclude doc/manual/release-notes \
      --type file \
      . \
      nixos \
      --exec-batch sed --in-place --regexp-extended "
        s/\<builtins\.($(
          printf '%s\n' "${builtins[@]}" |
            paste --delimiter '|' --serial -
        ))\>/\1/g
      "

    nix fmt
2026-01-15 16:07:55 +01:00
Sigmanificient
a939c13d89 ecryptfs: drop 2026-01-14 09:33:38 +01:00
Sandro
0047af3790 sabnzbd: module settings, secrets management (#416165) 2026-01-10 21:14:10 +00:00
Adam Dinwoodie
8e94561d62 nixpkgs: pass lib to config function
Nixpkgs config, for defining things like which licenses are
permitted, can either be an attrset or a function that is passed a
`pkgs` argument.  Evaluating that `pkgs` argument requires computing the
Nixpkgs fixpoint, which requires checking whether the derivations used
in the Nixpkgs bootstrap have valid licenses.  This works provided
nothing tries to use Nixpkgs functions to validate or merge anything
included in the configuration.

f5deefd463 (config: add and document {allow,block}listedLicenses,
2025-08-31), in #437723, added type checking and merging to the lists of
permitted/forbidden licenses.  That resulted in a recursion loop if a
list of licenses included, say, `pkgs.lib.licenses.bsd0`.

To allow licenses to be specified from Nixpkgs' library, pass `lib` as
well as `pkgs` to any config function.  Computing `lib` doesn't require
working out the full Nixpkgs fixpoint.  The change in #437723 will still
break things for some people, but it at least provides a sensible route
to getting the config working again.

Fixes #456994.
2026-01-05 21:36:29 +00:00
Martin Häcker
b9cccbb973 nixos/misc/nixpkgs: add tests for nixpkgs.config.allowUnfreePackages 2026-01-03 20:40:38 +01:00
‮rekcäH nitraM‮
a3c9221d64 nixos/misc/nixpkgs: add setting nixpkgs.config.allowUnfreePackages = ["list" "of "packages"]
Inspired by https://github.com/NixOS/nixpkgs/issues/197325 this adds a
new option nixpkgs.allowUnfreePackages, which merges additively and can
thus be defined in multiple modules close to where the unfree package is
installed.

I would have liked ot name this option
nixpkgs.config.allowUnfreePackages, to define it closer to where the
allowUnfree and allowUnfreePredicate are defined, but I didn't see how
this could be achived. I would welcome some guidance on how to do this.
2026-01-03 20:40:33 +01:00
Michele Guerini Rocco
fe7274e196 nixos/man-db: Use -q option to decrease verbosity (#468229) 2025-12-16 12:02:26 +00:00
ash
69c73c047e nixos/man-db: Use -q option to decrease verbosity
This also reverts commit 87d614441d
("nixos/documentation: silence man-db cache warnings").
2025-12-16 10:28:19 +00:00
Klaus Frank
14b19cf62d docs: Make nixpkgs.pkgs defaultText c'n'p-able
Currently the defaultText of nixpkgs.pkgs uses the cfg variable. The search.nixos.org page is not able to resolve that variable.

Replacing "cfg" within this docs text with the non-aliased "config.nixpkgs".
2025-12-05 16:39:33 +01:00
Mitchell Skaggs
d737091da3 nixos/man-db: set preferLocalBuild = true
When we _must_ build, prefer building locally since we probably already have the manpages here. Otherwise, Nix would send all the manpages to a remote builder which isn't likely to be much faster since building the DB is single-threaded. Hopefully a best-of-both worlds between keeping or removing 39e63f110e.
2025-11-02 09:28:29 -06:00
Wolfgang Walther
f2640ee208 top-level: return __splicedPackages 2025-10-31 20:34:05 +01:00
Aliaksandr
80f12557f5 treewide: replace "yes" else "no" usages to lib.boolToYesNo 2025-10-21 16:04:34 +03:00
Will Fancher
f75a8b7e9a nixos/users-groups: New clock system group 2025-10-03 01:35:22 -04:00
h7x4
a7a8289ee9 nixos/misc/ids: use more accurate int types 2025-09-22 18:45:49 +02:00
Maximilian Bosch
a48aa7995c nixos/nixpkgs: correct some option defaults (#441948) 2025-09-17 09:13:33 +00:00
Adam C. Stephens
ec17e680af lxd: remove packages and modules 2025-09-13 12:47:00 -04:00
éclairevoyant
45193d5a8c nixos/nixpkgs: correct some option defaults 2025-09-11 17:12:35 -04:00
lschuetze
938def762c sabnzbd: remove hardcoded uid and gid 2025-08-22 16:58:00 +02:00
Jade Lovelace
602cc45c09 nixos/gateone: remove
The package is literally gone, this could never work.
2025-08-21 21:39:45 -07:00
Robert Hensing
4d3eb9460a Factor out the NixOS meta.maintainers module (#431450) 2025-08-21 10:11:08 +02:00
Aaron Andersen
487e725463 php.services.default: init 2025-08-06 21:24:04 -04:00
Robert Hensing
0c156a7144 modules/generic/meta-maintainers: init
This factors out `meta.maintainers` from NixOS `misc/meta.nix` for use in arbitrary
Module System applications.

It is useful beyond NixOS and not coupled to it, although it is currently coupled to Nixpkgs'
`lib.maintainers`.
That restriction could be lifted optionally if there's future demand.
2025-08-06 14:58:50 +02:00
Robert Hensing
dcc0ee9ea1 nixos/documentation: Allow the inclusion of a nixpkgs/modules directory 2025-08-06 14:58:50 +02:00
Robert Hensing
efaca0c196 nixos/meta: Fix maintainers example
`maintainers.all` does not exist, and should not exist.

Neither does `alice`, but she's a metavariable.
2025-08-06 14:40:49 +02:00