Commit graph

15793 commits

Author SHA1 Message Date
Bas van Dijk b517409c6b
Merge pull request #77668 from basvandijk/hydra-rm-option-build-use-substitutes
hydra: remove the build-use-substitutes option
2020-01-15 09:30:18 +01:00
Florian Klink 4b4e59b18d
Merge pull request #77664 from tfc/transmission-torrent-test-fix
nixos/transmisison: Transmission torrent test fix
2020-01-15 00:58:31 +01:00
Erik Arvstedt 5bdb653baf test-driver.py: fix decoding of VM output
The codec format 'unicode_escape' was introduced in 52ee102 to handle
undecodable bytes in boot menus.

This made the problem worse as unicode chars outside of iso-8859-1
produce garbled output and valid utf-8 strings (such as "\x" ) trigger
decoding errors.

Fix this by using the default 'utf-8' codec and by explicitly ignoring
decoding errors.
2020-01-14 15:52:44 -08:00
Erik Arvstedt caa435fd1d test-driver.py: specify coreutils dependency
Otherwise the driver script fails when coreutils are not in PATH.
2020-01-14 15:52:44 -08:00
Susan Potter 16fc4dd77d
nixos/doc+manual: update copyright year range end 2019->2020 2020-01-14 07:01:39 -06:00
Bas van Dijk ad554b3e4e hydra: only set buildMachinesFiles when nix.buildMachines is defined
This applies [hydra PR #432](https://github.com/NixOS/hydra/pull/432)
to the NixOS module in nixpkgs:

```
commit 4efd078977e5ea20e1104783efc324cba11690bc
Author: Bas van Dijk <v.dijk.bas@gmail.com>
Date:   Sun Dec 11 15:35:38 2016 +0100

    Only set buildMachinesFiles when nix.buildMachines is defined
```
2020-01-14 12:32:40 +01:00
Bas van Dijk f34aaa6646 hydra: remove the build-use-substitutes option
The following commit from 2016 in hydra removed the `--option
build-use-substitutes` from the hydra-queue-runner service:

```
commit ee2e9f5335c8c0288c102975b506f6b275793cfe
Author: Eelco Dolstra <edolstra@gmail.com>
Date:	Fri Oct 7 20:23:05 2016 +0200

    Update to reflect BinaryCacheStore changes

    BinaryCacheStore no longer implements buildPaths() and ensurePath(),
    so we need to use copyPath() / copyClosure().
```

It would be better if the hydra module in NixOS matches the upstream
module.
2020-01-14 12:14:25 +01:00
Francesco Zanini 9974bb16b0 systemd-networkd: add configuration for XFRM interfaces 2020-01-14 11:33:18 +01:00
Jacek Galowicz adf5642ba6 nixosTests.bittorrent: Refactor declarative part 2020-01-14 10:22:46 +01:00
Jacek Galowicz e1b1f5a484 nixosTests.bittorrent: Fix declarative httpd description 2020-01-14 10:11:57 +01:00
Jacek Galowicz 7f69fdd182 nixos/transmission: Fix module code 2020-01-14 10:10:45 +01:00
Marijan Petričević 61c61f80e5 nixos/test: added verbose output for failed tests 2020-01-14 09:33:10 +01:00
Peter Hoeg 41d333e024
Merge pull request #60981 from thefloweringash/usb-modeswitch
usb_modeswitch: fixes
2020-01-14 10:48:45 +08:00
Vanya Klimenko ed52a6567c nixos/nginx/gitweb: add some (crucial) options
This replaces some hardcoded values in nginx's VirtualHosts's
configuration with customizable options. Previous values are kept as
default, so nothing should break for existing users.

Co-Authored-By: Florian Klink <flokli@flokli.de>
2020-01-14 00:11:10 +00:00
Silvan Mosberger 55b0129a14
Merge pull request #76178 from 0x4A6F/master-xandikos
xandikos: add tests and module
2020-01-13 23:48:22 +01:00
Martin Milata d9319e8e87 nixos/ndppd: enable systemd sandboxing 2020-01-13 11:11:32 +00:00
Robin Gloster 8305186bb4
Merge pull request #77554 from lheckemann/fix-wpa-multiple1
nixos/wpa_supplicant: fix use with multiple interfaces
2020-01-13 12:07:54 +01:00
Linus Heckemann 247c25d302
Merge pull request #77473 from mayflower/worktrees
lib.commitIdFromGitRepo: support git-worktree
2020-01-13 12:01:49 +01:00
markuskowa 9bedc18507
Merge pull request #77553 from c0deaddict/fix/gitea-typo
nixos/gitea: fix typo
2020-01-13 09:29:08 +01:00
Erik Arvstedt 9ed03f2103 nixos/paperless: fix tmpfiles rules
Previously, the service expected the paperless user to have a group with
the user's name. This is not necessarily the case for custom users.
2020-01-13 02:01:23 +00:00
Erik Arvstedt 5ad5d2321f nixos/paperless: don't use deprecated types.loaOf
This removes a warning.
2020-01-13 02:01:23 +00:00
Eric Culp 21f567bdd9 test-driver.py: Share the shared dir between VMs
This changes the python test driver to match the behavior of the perl
test driver.  I.e. the directory mounted into /tmp/shared should be the
same for all machines.

This probably fixes many tests, but I found this while investigating
failures in nixos/tests/ceph-multi-node.nix.
2020-01-12 15:49:17 -08:00
worldofpeace d04c6e0c26
Merge pull request #77324 from worldofpeace/buildbot-eval
nixos/buildbot: fix eval, and some twin issues
2020-01-12 15:17:19 -05:00
worldofpeace 2af959e579 nixos/jenkins/slave: fix eval 2020-01-12 15:17:05 -05:00
Jan Tojnar 61cf52bc17
Merge pull request #77501 from jtojnar/more-loaof-fxes
tree-wide: fix more warning related to loaOf deprecation
2020-01-12 18:47:34 +01:00
Franz Pletz 23bdc67f8b
Merge pull request #77561 from Mic92/openldap
nixos/openldap: check configuration with slaptest
2020-01-12 16:33:34 +00:00
Silvan Mosberger d6ad9ce105
nixos/usbmuxd: Fix users.groups assignment
A mistake was introduced in https://github.com/NixOS/nixpkgs/pull/63103
2020-01-12 16:53:27 +01:00
Jörg Thalheim 382b0aa52d
nixos/openldap: check configuration with slaptest
slapd does only print the error and not the line number.
Sometimes it is not even clear that it fails to start
due to an incorrect configuration file.

Example output of slaptest:

5e1b2179 /nix/store/gbn2v319d4qgw851sg41mcmjm5dpn39i-slapd.conf: line 134 objectClass: Missing closing parenthesis before end of input
ObjectClassDescription = "(" whsp
  numericoid whsp                 ; ObjectClass identifier
  [ "NAME" qdescrs ]
  [ "DESC" qdstring ]
  [ "OBSOLETE" whsp ]
  [ "SUP" oids ]                ; Superior ObjectClasses
  [ ( "ABSTRACT" / "STRUCTURAL" / "AUXILIARY" ) whsp ]
                                  ; default structural
  [ "MUST" oids ]               ; AttributeTypes
  [ "MAY" oids ]                ; AttributeTypes
  whsp ")"
slaptest: bad configuration file!
2020-01-12 14:25:49 +00:00
Robert Hensing 9884cb3ed0
Merge pull request #76861 from Infinisil/paths-as-submodules
lib/types: Allow paths as submodule values
2020-01-12 14:19:04 +01:00
Linus Heckemann bbd6d219e4 nixos/wpa_supplicant: fix #61391 2020-01-12 14:14:16 +01:00
Jos van Bakel a171244455
nixos/gitea: fix typo 2020-01-12 12:51:01 +01:00
Eric Culp dc6451f08c nixos/tests/certmgr: Fix file permissions
This test has been broken since 2a413da57e, which stopped running the
nginx master process as root.
2020-01-11 16:18:10 -08:00
volth 6abba2294d nixos/nat: use nixos-nat-out instead of OUTPUT 2020-01-12 00:06:49 +01:00
snicket2100 1657acd5d4 actkbd: fixed the description of the services.actkbd.bindings option
The description referred to `<option>sound.enableMediaKeys</option>`,
which is actually called `<option>sound.mediaKeys.enable</option>`.
2020-01-11 13:07:19 -08:00
0x4A6F c9ca370e32
nixos/xandikos: init 2020-01-11 16:08:45 +01:00
0x4A6F 78aec9cfcb
nixosTests.xandikos: init 2020-01-11 16:08:44 +01:00
Lennart 4e6e94417c nixos/nextcloud: added trusted_proxies setting (#77480) 2020-01-11 15:43:43 +01:00
Michael Weiss 0608d78f3c
Merge pull request #76437 from gnidorah/sway
nixos/sway: add programs.sway.extraOptions
2020-01-11 12:16:34 +01:00
Jan Tojnar e85b34c484
tree-wide: fix more warning related to loaOf deprecation 2020-01-11 08:09:56 +01:00
Tim Steinbach ada59cfd43
kafka: Add 2.4 2020-01-10 21:02:03 -05:00
Alyssa Ross 59c4035e58 nixos/spamassassin: allow initPreConf to be a path
Supporting a path here is important because it allows e.g. fetching a
configuration from a URL.  To do this and provide the configuration as
a string, IFD would be necessary.  It's just written into a path
anyway.
2020-01-10 21:49:06 +00:00
elseym c9214c394b
lib.commitIdFromGitRepo: support git-worktree
lib.commitIdFromGitRepo now resolves the refs from the
parent repository in case the supplied path is a file
containing the path to said repository. this adds support
for git-worktree and things alike. see gitrepository-layout(5).

this also:
- adds a new boolean function lib.pathIsRegularFile to
  check whether a path is a regular file
- patches lib.revisionWithDefault and
  the revision and versionSuffix attributes in
  config.system.nixos in order to support git-worktrees
2020-01-10 22:29:48 +01:00
Florian Klink 47e0ce7f1a
Merge pull request #77303 from tfc/port-elk-initdb-kafka
Port elk initdb kafka
2020-01-10 17:05:04 +01:00
Silvan Mosberger 5239b328f8
lib/types: Introduce lazyAttrsOf (#70138)
lib/types: Introduce lazyAttrsOf
2020-01-10 16:35:25 +01:00
Jörg Thalheim a69d3f33d4
nixos/powertop: wait for hardware to initialize (#77364)
nixos/powertop: wait for hardware to initialize
2020-01-10 15:25:51 +00:00
Silvan Mosberger b48717d1eb
lib/types: Introduce lazyAttrsOf
The standard attrsOf is strict in its *values*, meaning it's impossible to
access only one attribute value without evaluating all others as well.
lazyAttrsOf is a version that doesn't have that problem, at the expense
of conditional definitions not properly working anymore.
2020-01-10 16:19:55 +01:00
Silvan Mosberger d5a2922641
nixos/doc: Note that attrsOf is strict in its values 2020-01-10 16:19:54 +01:00
Niklas Hambüchen 902d102c85
Merge pull request #77279 from maralorn/stateVersion-docs
Improve documentation for stateVersion
2020-01-10 14:42:27 +01:00
Jacek Galowicz abebf8cdb3 nixosTests.initdb: Move code to existing postgres test 2020-01-09 23:21:51 +01:00
Jacek Galowicz fff1c2867f nixosTests.postgres: Refactor code 2020-01-09 23:21:08 +01:00
gnidorah ad8a430a3a
nixos/sway: add programs.sway.extraOptions 2020-01-09 22:25:01 +01:00
Alyssa Ross 65dcd244bc maintainers/create-azure.sh: run from anywhere
I'm not really sure how the line directly after ended up with this,
but this line didn't...
2020-01-09 20:54:28 +00:00
markuskowa 2913973aa7
Merge pull request #76938 from lourkeur/fix_76184_gnunet
nixos/gnunet: Add types to the options
2020-01-09 21:33:50 +01:00
markuskowa 59670b0c56
Merge pull request #76939 from lourkeur/fix_76184_tsocks
nixos/tsocks: Add types to the options
2020-01-09 21:33:18 +01:00
Florian Klink 2603d15a4d
Merge pull request #77167 from srhb/ceph-14_2_5
ceph: 14.2.4 -> 14.2.5
2020-01-09 18:39:05 +01:00
Silvan Mosberger e9c16ec186
Merge pull request #76857 from Infinisil/recursive-disableModules
Apply `disabledModules` recursively
2020-01-09 18:20:12 +01:00
Silvan Mosberger a6462a4a8b
nixos/doc: Extend disabledModules docs to indicate recursive disabling 2020-01-09 17:26:08 +01:00
Silvan Mosberger 7167985e34
nixos/documentation: Fix disabledModules being rendered
Previously disabledModules would not be disabled for the manual
2020-01-09 17:26:08 +01:00
Florian Klink 5a523d70f6
Merge pull request #77158 from aanderse/mysql
nixos/mysql: restart systemd service on abort
2020-01-09 17:04:40 +01:00
Silvan Mosberger 9d4b59b549
nixos/doc: Add incompatibility note for either submodule path
Co-Authored-By: Robert Hensing <roberth@users.noreply.github.com>
2020-01-09 16:47:53 +01:00
Denys Pavlov 90b6823373 nixos/powertop: wait for hardware to initialize
We should wait until after `multi-user.target` is triggered to allow
hardware to finish initializing, such as network devices and USB drives.
This ensures `powertop --auto-tune` sets more tunables to "Good".

Fixes #66820
2020-01-09 19:45:41 +08:00
Jörg Thalheim 5121edc703
home-assistant: 0.100.3 -> 0.103.2 (#76088)
home-assistant: 0.100.3 -> 0.103.2
2020-01-09 11:29:04 +00:00
Florian Klink 959034d8e9
Merge pull request #77355 from andersk/gdm-tmpfiles
nixos/gdm: Fix tmpfiles configuration syntax
2020-01-09 12:12:57 +01:00
Oleksii Filonenko 25b75b8fb5
nixosTests.home-assistant: port to python 2020-01-09 10:39:50 +00:00
Jörg Thalheim 283e3e7218
nixos/home-assistant: support for secrets 2020-01-09 10:39:50 +00:00
Jörg Thalheim ff5ddd04f3
nixos/pam: cleanup services (#76885)
nixos/pam: cleanup services
2020-01-09 10:09:13 +00:00
Sarah Brofeldt 59233d67b1 nixos/tests/ceph: Use 3 osds, the default minimum 2020-01-09 08:00:19 +01:00
Anders Kaseorg 07ccbc099a nixos/gdm: Fix tmpfiles configuration syntax
Fixes this error from `nixos-rebuild switch` introduced by #75893:

setting up tmpfiles
[/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'.
warning: error(s) occurred while switching to the new configuration

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-08 19:51:32 -08:00
Léo Gaspard b31660e5bb
Merge branch 'master' into ihatemoney 2020-01-09 03:49:03 +01:00
Silvan Mosberger 6525da6321
lib/types: Allow paths as submodule values 2020-01-08 23:54:45 +01:00
Silvan Mosberger 228a7b173e
nixos/certmgr: Flip either submodule path type
For upcoming allowance of paths as submodules
2020-01-08 23:54:45 +01:00
Pascal Bach 0319241132 nixos/mxisd: fix empty user name 2020-01-08 23:18:26 +01:00
Pascal Bach 76506ae42f nixos/matrix-synapse: fix empty user name 2020-01-08 23:18:26 +01:00
Aaron Andersen 336a6f471f nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command 2020-01-08 10:37:46 -05:00
worldofpeace 79de730e77 nixos/buildbot: fix eval
Fixes https://github.com/NixOS/nixpkgs/issues/77309
2020-01-08 10:06:08 -05:00
worldofpeace a408bcbe44
Merge pull request #73938 from worldofpeace/port-gnome3-xorg-test
nixosTests.gnome3-xorg: port to python/rewrite
2020-01-08 09:38:29 -05:00
Jacek Galowicz f7b274d957 nixosTests.kafka: port to python 2020-01-08 10:51:57 +01:00
Jacek Galowicz 8ecd07f9e3 nixosTests.elk: port to python 2020-01-08 10:51:57 +01:00
worldofpeace 1c2e27e4d5 nixos/systemd-lib: don't fail on systemd.packages duplicates
In some cases like we've noticed in https://github.com/NixOS/nixpkgs/issues/76169,
having duplicate packages in systemd.packages like
```
systemd.packages = [ gnome-shell gnome-shell gnome-session ];
```
breaks.

Here we use an associative array to ensure no
duplicate paths when we symlink all the units listed
in systemd.packages.
2020-01-07 21:42:14 -05:00
Silvan Mosberger 32104e7c77
nixos/doc: document the loaOf type deprecation (#77109)
nixos/doc: document the loaOf type deprecation
2020-01-08 03:25:51 +01:00
rnhmjoj fa3919de5f
nixos/doc: document the loaOf type deprecation 2020-01-08 00:47:59 +01:00
Malte Brandy c1d7850f85
Improve documentation for stateVersion
The meaning of stateVersion often leads to a lot of confusion. This
commit trys to improve that situation.
2020-01-07 22:27:03 +01:00
Jacek Galowicz c44331dd5d nixosTests.initdb: port to python 2020-01-07 20:52:24 +01:00
Rickard Nilsson 6edbe844b2 nixos/tests/chromium: Fix nixos-hex.svg hash 2020-01-07 19:42:52 +01:00
Milan Pässler 2a31a6a412 tree-wide: fix errors and warning related to loaOf deprecation 2020-01-07 06:23:28 +01:00
Aaron Andersen df059f89e6 nixos/mysql: restart systemd service on abort 2020-01-06 20:08:51 -05:00
Silvan Mosberger ff16d17b42
nixos/systemd: Explicitly put default path packages after othe… (#77088)
nixos/systemd: Explicitly put default path packages after others
2020-01-06 21:51:04 +01:00
worldofpeace c496b1b102
Merge pull request #63103 from rnhmjoj/loaof
Deprecate types.loaOf [WIP]
2020-01-06 11:00:17 -05:00
WilliButz 482b39a7e5
nixos/oxidized: add missing slash to PIDFile path 2020-01-06 16:58:54 +01:00
rnhmjoj 1d61efb7f1 treewide: use attrs instead of list for types.loaOf options 2020-01-06 10:39:18 -05:00
Silvan Mosberger 9327e1c6ba
nixos/systemd: Explicitly put default path packages after others
This fixes the dhcpcd issue in https://github.com/NixOS/nixpkgs/issues/76969,
which was exposed by https://github.com/NixOS/nixpkgs/pull/75031
introducing changes in the module ordering and therefore option ordering
too.

The dhcpcd issue would also be fixable by explicitly putting
dhcpcd's paths before others, however it makes more sense for systemd's
default paths to be after all others by default, since they should only
be a fallback, which is how binary finding will work if they come after.
2020-01-06 15:58:06 +01:00
worldofpeace 00c813a636
Merge pull request #75893 from worldofpeace/gdm-tmpfiles
nixos/gdm: use systemd tmpfiles instead of preStart
2020-01-06 09:51:59 -05:00
Jan Tojnar 04a71194a8
Merge pull request #76683 from wakira/nixos/ibus
nixos/ibus: fix missing dconf profile
2020-01-06 12:59:00 +01:00
Sheng Wang c71339fbe5 nixos/ibus: fix missing dconf profile
Fix ibus user preferences not being saved. ibus-daemon was falling back on null configuration due to missing "ibus" dconf profile.
2020-01-06 20:30:37 +09:00
Robert Hensing e1ce60ae7a
Merge pull request #76947 from juliancoffee/master
Fix example for xkbOptions
2020-01-05 23:35:27 +01:00
Robert Hensing 933003e684
Merge pull request #73394 from pasqui23/xkbopt
nixos/xserver:services.xserver.xkbOptions is now commas
2020-01-05 23:34:59 +01:00
Eelco Dolstra 3b15451291
nix: 2.3.1 -> 2.3.2 2020-01-05 20:35:43 +01:00
Symphorien Gibol 665fee312a nixos/tests/ihatemoney.nix: run nixpkgs-fmt
now indentation is perfect
2020-01-05 12:00:00 +00:00
symphorien b8b9e7be6d
Update nixos/tests/ihatemoney.nix
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
2020-01-05 22:04:42 +00:00
symphorien 54b0ab0ac6
Update nixos/tests/ihatemoney.nix
Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
2020-01-05 22:04:32 +00:00