about summary refs log tree commit diff
path: root/nixos/modules
AgeCommit message (Collapse)AuthorFilesLines
2022-01-23Merge staging-next into staginggithub-actions[bot]1-41/+14
2022-01-23Merge master into staging-nextgithub-actions[bot]1-41/+14
2022-01-22Merge pull request #152367 from helsinki-systems/fix/dovecot-ssh_dhGuillaume Girol1-41/+14
nixos/dovecot: make ssl_dh optional
2022-01-22Merge staging-next into staginggithub-actions[bot]3-8/+82
2022-01-22Merge master into staging-nextgithub-actions[bot]3-8/+82
2022-01-22Merge pull request #153594 from hercules-ci/flake-avoid-copying-nixpkgs-pathpennae2-4/+74
pkgs.path: Avoid copying when used via flake
2022-01-22Merge pull request #156004 from ju1m/redisGuillaume Girol1-4/+8
nixos/redis: fix port option
2022-01-22nixos/documentation.nix: Use builtins.storePath when appropriateRobert Hensing1-14/+68
2022-01-22flake.nix: Set nixpkgs.config.pathRobert Hensing1-0/+2
2022-01-22nixos/documentation.nix: Only use store non-flake pkgs.path directly when ↵Robert Hensing1-1/+7
already copied
2022-01-22nixos/documentation: avoid copying nixpkgs subpaths, iteration 2Robert Hensing1-3/+11
This kind of reverts commit 893ffee2866dbf9f2aa6e3128368e0cd5729e4b9.
2022-01-22Merge staging-next into staginggithub-actions[bot]1-1/+1
2022-01-22Merge master into staging-nextgithub-actions[bot]1-1/+1
2022-01-22Merge pull request #156083 from Luflosi/fix-test-networking.networkd.staticpennae1-1/+1
nixos/networkd: fix networking.networkd.static test
2022-01-22Merge staging-next into staginggithub-actions[bot]1-11/+18
2022-01-22Merge master into staging-nextgithub-actions[bot]1-11/+18
2022-01-21Merge pull request #155517 from Radvendii/knownHostspennae1-11/+18
programs.ssh.knownHosts.<name>.hostNames -> extraHostNames
2022-01-21nixos/redis: fix port optionJulien Moutinho1-4/+8
2022-01-21nixos/networkd: fix networking.networkd.static testLuflosi1-1/+1
Commit ca58bd0a50f38de43b401df716806c0f83479a8e broke the test networking.networkd.static. This happened because the test sets `networking.defaultGateway`. This is implemented by adding the gateway to the list of `routes` using `mkDefault`. The `routes` are then overridden by an empty list in the newly added code. Replace `mkDefault` with `id` so the two lists are merged and everything (hopefully) works as expected. See https://github.com/NixOS/nixpkgs/pull/144590 for a more context.
2022-01-21Merge staging-next into staginggithub-actions[bot]3-19/+24
2022-01-21Merge master into staging-nextgithub-actions[bot]3-19/+24
2022-01-21Merge pull request #155522 from Julow/single_line_strRobert Hensing1-1/+1
types.singleLineStr: strings that don't contain '\n'
2022-01-21Merge pull request #153095 from Madouura/dev/bcachefs-initJanne Heß1-17/+22
nixos/stage-1: colon-separated multi-device support
2022-01-21Merge pull request #155962 from NixOS/containers-bootloaderRobert Hensing1-1/+1
nixos/container-config: Only use `true` as fallback
2022-01-21Merge staging-next into staginggithub-actions[bot]1-8/+16
2022-01-21Merge master into staging-nextgithub-actions[bot]1-8/+16
2022-01-21Merge pull request #155502 from yayayayaka/nextcloud-optional-headersMaximilian Bosch1-8/+16
nixos/nextcloud: Optionally disable setting HTTP response headers
2022-01-21Merge staging-next into staginggithub-actions[bot]7-4/+92
2022-01-21Merge master into staging-nextgithub-actions[bot]7-4/+92
2022-01-21Merge pull request #144590 from Luflosi/networkd-routesMichele Guerini Rocco2-0/+74
nixos/networkd: Add routes from interfaces to [Route] section of .network file
2022-01-20nixos: use `uniq` in the type of system.buildNaïm Favier1-1/+1
`unspecified` will happily concatenate strings together from two unrelated modules, causing spurious errors (see #155925).
2022-01-20nixos/container-config: Only use `true` as fallbackJan Tojnar1-1/+1
LXC containers like those used by VPSAdminOS might want to install a bootloader so passing `true` to `system.build.installBootLoader` without any priority specified, causes a conflict for such systems with the recent `system.build` changes: https://github.com/NixOS/nixpkgs/commit/4014fb6a64bc5f68326fc08cbaa83475db1fae8e Fixes: https://github.com/NixOS/nixpkgs/issues/155839
2022-01-20Merge pull request #155854 from datafoo/networkd-IPMasquerade-assertpennae1-1/+1
nixos/networking: fix assertion on IPMasquerade
2022-01-20nixos/activation-script: ensure gcroots dir existsAlyssa Ross1-0/+1
If the Nix daemon has never been enabled (nix.enable has always been set to false), the gcroots directory won't exist. If the Nix daemon is later enabled, the GC roots for booted-system and current-system will be missing, and they might end up being garbage collected. Since it's cheap to add GC roots even if the daemon will never be enabled, let's just always add them so we're okay in the case where the daemon is enabled later.
2022-01-20Merge pull request #155928 from ncfavier/borgbackup-literalDocBookpennae1-1/+1
nixos/borgbackup: remove literalDocBook in description
2022-01-20nixos/networkd: Add routes from interfaces to [Route] section of .network fileLuflosi2-0/+74
Closes https://github.com/NixOS/nixpkgs/pull/93635.
2022-01-20Merge pull request #155499 from bachp/gitea-dump-fileMaximilian Bosch1-1/+14
nixos/gitea: allow specifying dump format and name
2022-01-20nixos/borgbackup: remove literalDocBook in descriptionNaïm Favier1-1/+1
2022-01-20Merge staging-next into staginggithub-actions[bot]4-0/+319
2022-01-20Merge master into staging-nextgithub-actions[bot]4-0/+319
2022-01-20nixos/invoiceplane: init module and package at 1.5.11 (#146909)Jonas Heinrich2-0/+306
2022-01-20Merge pull request #153211 from hercules-ci/minimal-nixosRobert Hensing2-0/+13
Add minimal NixOS entrypoint
2022-01-20nixos/networking: fix assertion on IPMasqueradedatafoo1-1/+1
2022-01-20Merge staging-next into staginggithub-actions[bot]1-12/+45
2022-01-20Merge master into staging-nextgithub-actions[bot]1-12/+45
2022-01-20Merge pull request #155478 from ivanbrennan/xmonad-enable-configured-recompileLassulus1-12/+45
XMonad: enable configured recompile
2022-01-20Merge pull request #155414 from jwygoda/fcc-unlockJan Tojnar1-0/+17
modemmanager: 1.18.2 -> 1.18.4
2022-01-20Merge master into staging-nextgithub-actions[bot]1-1/+9
2022-01-20Merge pull request #153075 from mattchrist/bind-forward-onlySandro1-1/+9
2022-01-19nixos/xmonad: update example configivanbrennan1-6/+24
Update the example config to show a working example for xmonad 0.17.0, which added an argument to the `launch` function and adjusted the location of the recompiled binary.