Commit graph

15022 commits

Author SHA1 Message Date
Peter Hoeg d2f083160f
Merge pull request #65971 from jb55/zoneminder-fix
zoneminder: fix nginx config
2019-11-08 17:05:27 +08:00
worldofpeace b53e773220
Merge pull request #73004 from philandstuff/patch-1
ssh-agent: fix syntax problem from #71139
2019-11-08 04:13:58 +00:00
Matthew Bauer c403d66b85
Merge pull request #71825 from AIDEA775/fix/zsh-syntax-highlighting
nixos/zsh-syntax-highlighting: Fix highlighting when ohMyZsh is enabled
2019-11-07 17:29:57 -05:00
Matthew Bauer 43c940f2d4
Merge pull request #70886 from allgreed/add-vbox-docs-hint
[Docs] Add a hint on Virtualbox machine setup
2019-11-07 17:24:14 -05:00
Philip Potter ce7d4e40f0
ssh-agent: fix syntax problem from #71139
Oops, in #71139 a missing `+` broke things quite badly.  Thanks @lzorkin for the
report and @mebubo for diagnosing the problem.
2019-11-07 22:13:18 +00:00
Matthew Bauer 03f8acabc8
Merge pull request #71408 from f--t/fix/x11-services
Fix nixos x11 service logging for ssdm and xmonad
2019-11-07 17:03:52 -05:00
Daniel Schaefer 25c2506095 nixos/cassandra: Port test to python 2019-11-07 22:40:15 +01:00
worldofpeace 1e7ddf233a
Merge pull request #72943 from marijanp/port-test-driver-python
Port remaining test-driver functions to python
2019-11-07 20:23:27 +00:00
Marek Mahut 1a65fc1041
Merge pull request #72887 from 1000101/master
Port tests to Python
2019-11-07 19:57:50 +01:00
worldofpeace 6ed6d1af6a
Merge pull request #72947 from tfc/boot-test-port-fix
Boot test port fix
2019-11-07 17:32:43 +00:00
Bjørn Forsman 2c09cfc097 nixos-rebuild: add explicit option to enable (remote) sudo
Add --use-remote-sudo option. When set, remote commands will be prefixed
with 'sudo'. This allows using sudo remotely _without_ having to use
sudo locally (when using --build-host/--taget-host).
2019-11-07 17:03:12 +01:00
WilliButz d7b18bcb37
Merge pull request #72904 from WilliButz/nixosTests/port-to-python
nixos/tests: port some tests to python (loki, grafana, pgjwt, initrd-ssh, exporters)
2019-11-07 16:14:17 +01:00
worldofpeace 65b2a768bb
Merge pull request #72979 from worldofpeace/more-gnome-installed-test-cleanup
More gnome installed test cleanup
2019-11-07 14:34:28 +00:00
worldofpeace 4dc696be90
Merge pull request #72525 from r-ryantm/auto-update/gcab
gcab: 1.2 -> 1.3
2019-11-07 13:52:48 +00:00
worldofpeace 9693d3922b all-tests.nix: remove gjs.nix 2019-11-07 08:09:26 -05:00
worldofpeace 9b99912d82 nixosTests.libgdata: port to python, move to installed-tests 2019-11-07 08:07:51 -05:00
Jan Tojnar e253d015a1
gcab: run & install tests
also add nixosTests.installed-tests.gcab for running the installed tests
2019-11-07 14:07:19 +01:00
Marijan Petricevic 2c3785a6ae nixos/docker-edge: port test to python 2019-11-07 14:06:40 +01:00
worldofpeace 75a8cd9930 all-tests.nix: remove libxmlb 2019-11-07 08:03:58 -05:00
worldofpeace 85251b3c24 nixosTests.libxmlb: port to python 2019-11-07 08:02:33 -05:00
WilliButz 426b467af8
nixos/tests/prometheus-exporters: port to python 2019-11-07 11:30:55 +01:00
WilliButz 34755fb5e4
nixos/tests/grafana: port to python 2019-11-07 11:30:54 +01:00
WilliButz 9a7101c999
nixos/tests/initrd-ssh: port to python 2019-11-07 11:30:02 +01:00
WilliButz 336bffae6d
nixos/tests/pgjwt: port to python 2019-11-07 11:30:02 +01:00
WilliButz ff4e86f4a5
nixos/tests/loki: port to python 2019-11-07 11:30:01 +01:00
Marijan f04daa6f38 nixos/dnscrypt-proxy: port test to python 2019-11-07 10:55:15 +01:00
Marijan dd188ae2dc nixos/couchdb: port test to python 2019-11-07 10:55:15 +01:00
Marijan bf816e44c4 nixos/documize: port test to python 2019-11-07 10:55:15 +01:00
Marijan e2c20c6230 nixos/docker: port test to python 2019-11-07 10:55:15 +01:00
Marijan 3695e600cc nixos/cjdns: port test to python 2019-11-07 10:55:15 +01:00
Marijan 30d1dfef4b nixos/cloud-init: port test to python 2019-11-07 10:55:15 +01:00
Marijan e05f546f3a nixos/cfssl: port test to python 2019-11-07 10:51:04 +01:00
Marijan 63cb143801 nixos/certmgr: port test to python 2019-11-07 10:51:04 +01:00
Marijan 349c14f950 nixos/cadvisor: port test to python 2019-11-07 10:51:04 +01:00
Marijan 2f7199af21 nixos/caddy: port test to python 2019-11-07 10:51:04 +01:00
Jacek Galowicz 52ee1026b0 nixos/test: Handle undecodable bytes
This threw exceptions in boot menus
2019-11-07 10:00:39 +01:00
worldofpeace 3780b9e69c
Merge pull request #72835 from tfc/nixos-integration-test-ports
Nixos integration test ports
2019-11-07 01:05:36 +00:00
worldofpeace a46c78142e
Merge pull request #72860 from worldofpeace/port-gnome3y-tests
Port gnome3 like tests to python and udisks2
2019-11-07 00:43:58 +00:00
worldofpeace d7c8ad7d69 nixosTests.flatpak: fix eval
optionalPackages are deprecated.
2019-11-06 19:18:28 -05:00
worldofpeace eee5986ac3 nixos/tests: add gnome-installed-tests with builder function
The test script is also ported to python.
2019-11-06 19:18:28 -05:00
worldofpeace ceec19f682 nixosTests.udisks2: port to python 2019-11-06 19:18:28 -05:00
worldofpeace 7d331eae2e nixosTests.packagekit: port to python 2019-11-06 19:18:28 -05:00
worldofpeace 7c716705fd
Merge pull request #72369 from worldofpeace/corefonts-drop
nixos/fontconfig-ultimate: remove
2019-11-07 00:13:14 +00:00
Aaron Andersen c22e76e450
Merge pull request #71605 from aanderse/redmine-cleanup
redmine: drop 3.4.x package, 4.0.4 -> 4.0.5
2019-11-06 18:02:48 -05:00
Silvan Mosberger d34194badd
nixos/networkmanager: fix merging options (#72916)
nixos/networkmanager: fix merging options
2019-11-06 23:34:40 +01:00
Marijan 9915a8ca45 nixos/tests: implemented python test-driver version of forwardPort 2019-11-06 22:43:37 +01:00
Marijan 01f79dfc9e nixos/tests: implemented python test-driver version of dumpTTYContents 2019-11-06 22:43:37 +01:00
Aaron Andersen dec234f986
Merge pull request #72789 from aanderse/httpd-again
nixos/httpd: module cleanup
2019-11-06 16:04:38 -05:00
Jacek Galowicz cf138b4e6b nixos/tests: Fix subprocess launch call for VM monitor
This crashed in the create-script case
2019-11-06 21:48:08 +01:00
Jan Tojnar 894fdfaf1f
nixos/networkmanager: fix merging options
Incorrect merging of modules resulted in dhcpcd being enabled causing flaky network connection.

https://github.com/NixOS/nixpkgs/pull/64364

Fixing it uncovered an infinite recursion from the same commit, previously masked by the incorrect merge.

We can just drop the `mkDefault` for `networking.wireless.enable` as it is already `false` by default.

Closes: https://github.com/NixOS/nixpkgs/issues/72416
2019-11-06 21:26:03 +01:00
worldofpeace 473cd0d4ba nixos/gnome3: add gnome-flashback to systemd.packages
When we did the revert of adding gnome-flashback to systemd.packages [0]
I forgot to test with other display managers. If we use GDM with gnome-flashback
it appears it doesn't try to fallback to non-systemd startup and always fails and
starts the regular gnome-session. So adding gnome-flashback to systemd.packages
was perfectly fine, but we did forgot one detail. We need systemd targets for the
customSessions which is added using  mkSystemdTargetForWm in the gnome-
flashback package.

[0]: 42f567b30d
2019-11-06 15:15:11 -05:00
worldofpeace 070fbc350c nixos/fontconfig-ultimate: remove
This module has been obsolete for several years now.
2019-11-06 12:02:35 -05:00
Jan Hrnko 8920cbc8aa nixos/signal-desktop: port test to python 2019-11-06 16:38:26 +01:00
Jan Hrnko 4ffdd43d2d nixos/rss2email: port test to python 2019-11-06 16:18:24 +01:00
Jan Hrnko 71824d769c nixos/roundcube: port test to python 2019-11-06 16:07:18 +01:00
Daniel Schaefer afbfef93a7 nixos/tests: Ignore shutdown/crash if not booted
Condition seems to be inverted. Crash and shutdown only make sense, when
the machine is booted; i.e. we return immediately otherwise.
In the Perl test driver this is:

    return unless $self->{booted};
2019-11-06 16:06:43 +01:00
Jan Hrnko 6868807c2f nixos/redis: port test to python 2019-11-06 15:57:56 +01:00
Jan Hrnko 9ca60eda5a nixos/radarr: port test to python 2019-11-06 15:56:04 +01:00
Maximilian Bosch abe853b84c
Merge pull request #70336 from abbradar/synapse-ipv6
matrix-synapse service: blacklist local IPv6 addresses by default
2019-11-06 13:14:04 +01:00
Marijan af117c388b nixos/borgbackup: port test to python 2019-11-06 12:46:24 +01:00
Marijan 54cc018b1e nixos/boot-stage1: port test to python 2019-11-06 12:46:24 +01:00
Marijan 44e6c84ea1 nixos/bind: port test to python 2019-11-06 12:46:24 +01:00
Marijan db54622145 nixos/beanstalkd: port test to python 2019-11-06 12:46:24 +01:00
Marijan f794de4e31 nixos/bcachefs: port test to python 2019-11-06 12:46:24 +01:00
Marijan 0f96f9f038 nixos/avahi: port test to python 2019-11-06 12:46:24 +01:00
Marijan e86b9b9f08 nixos/atd: port test to python 2019-11-06 12:46:24 +01:00
Jan Hrnko 3803abae68 nixos/snapper: port test to python 2019-11-06 12:44:51 +01:00
Jan Hrnko 1b6ca29f6d nixos/strongswan-swanctl: port test to python 2019-11-06 12:43:08 +01:00
Jan Hrnko c0c04737ed nixos/telegraf: port test to python 2019-11-06 12:40:43 +01:00
Jan Hrnko 8060e76037 nixos/xautolock: port test to python 2019-11-06 12:30:29 +01:00
Jan Hrnko 6ea7ba4d69 nixos/moodle: port test to python 2019-11-06 12:27:14 +01:00
worldofpeace 3485204442 nixos/corefonts: remove
4 years ago in 7edb27b7af the option was made
hidden. We should just remove the module and use mkRemovedOptionModule.
2019-11-06 02:47:00 -05:00
Jan Hrnko 650ccb604b nixos/morty: port test to python 2019-11-06 07:58:22 +01:00
Jan Hrnko 38b2e18faa nixos/upnp: port test to python 2019-11-06 07:54:45 +01:00
Jan Hrnko 13febec464 nixos/zookeeper: port test to python 2019-11-06 07:54:37 +01:00
Jan Hrnko 49914d7d8b nixos/yabar: port test to python 2019-11-06 07:54:16 +01:00
Jan Hrnko 274fb7e0b9 nixos/trickster: port test to python 2019-11-06 07:17:39 +01:00
worldofpeace 5efe49ce67 nixosTests.fontconfig-default-fonts: port to python 2019-11-05 19:51:48 -05:00
worldofpeace e73c93d8e6
Merge pull request #72834 from mweinelt/pr/tests/migrate-python
nixos/tests: migrate my tests to python
2019-11-05 21:33:50 +00:00
Jan Hrnko 23340a21b6 nixos/trezord: port test to python 2019-11-05 21:45:12 +01:00
Jan Hrnko 5768950f01 nixos/trac: port test to python 2019-11-05 21:45:02 +01:00
Jan Hrnko 6465a56d38 nixos/metabase: port test to python 2019-11-05 21:44:51 +01:00
Izorkin 9a27acedda nixos/phpfpm: fix apply global phpOptions 2019-11-05 23:22:30 +03:00
Jacek Galowicz d6b7a9909e nixos/firefox: Port integration test to python 2019-11-05 18:07:05 +01:00
Jacek Galowicz 45b339b736 nixos/tests: Implement python test-driver version of getWindowNames and waitForWindow 2019-11-05 18:07:05 +01:00
Jacek Galowicz fdb72f68ad nixos/matrix-synapse: Port integration test to python 2019-11-05 18:07:04 +01:00
Jacek Galowicz 9c54658226 nixos/tests: Implement python test-driver version of requireActiveUnit 2019-11-05 18:07:00 +01:00
Florian Klink 5fecc35bb2 nixos/vault: convert test to python 2019-11-05 16:57:08 +01:00
EEva (JPotier) 9b78e5f35d vault: fix config when file backend is used
When the option services.vault.storageBackend is set to "file", a
systemd.tmpfiles.rules was added, with extraneous []. These are not
needed and have been removed.
2019-11-05 16:54:34 +01:00
Martin Weinelt 014970bc17
nixos/knot: add myself as maintainer for test 2019-11-05 16:19:44 +01:00
Martin Weinelt 76df6d67ea
nixos/knot: port test to python 2019-11-05 16:19:40 +01:00
Martin Weinelt e13f4057e4
nixos/babeld: port test to python 2019-11-05 16:19:35 +01:00
Colin L Rice c861f8083d sd-image: Add the compressed file path for hydra.
This makes the nixos on arm user instructions work again.
2019-11-05 10:10:51 -05:00
Jan Tojnar 9d36ef765c
gjs: various improvements (#72805)
gjs: various improvements
2019-11-05 16:00:24 +01:00
Eelco Dolstra 50ea99cbc1
nixos/tests/quake3.nix: Remove
This was a demo of the VM testing approach in an old paper but there's
no need to keep it around.
2019-11-05 15:14:30 +01:00
Eelco Dolstra aa98348f88
jormungandr: Remove
This is a good example of a package/module that should be distributed
externally (e.g. as a flake [1]): it's not stable yet so anybody who
seriously wants to use it will want to use the upstream repo. Also,
it's highly specialized so NixOS is not really the right place at the
moment (every NixOS module slows down NixOS evaluation for everybody).

[1] https://github.com/edolstra/jormungandr/tree/flake
2019-11-05 15:00:58 +01:00
Marijan 7d98a8ba77 nixos/simple: port test to python 2019-11-05 12:00:26 +01:00
Marijan 16d2fccfd9 nixos/nix-generate-config: port test to python 2019-11-05 12:00:26 +01:00
Marijan 1afa50aef1 nixos/fsck: port test to python 2019-11-05 12:00:26 +01:00
Marijan 04f0961627 nixos/transmission: port test to python 2019-11-05 12:00:26 +01:00
Marijan daa97862b5 nixos/tor: port test to python 2019-11-05 12:00:26 +01:00
Marijan b786c1be04 nixos/openssh: port test to python 2019-11-05 12:00:19 +01:00
Jan Tojnar 3d89ead7c6
gjs: move to top-level 2019-11-05 00:47:04 +01:00
Julian Stecklina 40396a7e12 nixos/zfs: convert test to python 2019-11-04 23:51:10 +01:00
Jacek Galowicz 48508da01e nixos/automysqlackup: Port test to python 2019-11-04 23:51:10 +01:00
Jacek Galowicz 986a1eb32b nixos/ammonite: Port test to python 2019-11-04 23:51:10 +01:00
Jacek Galowicz e5ee596263 nixos/acme: Port test to python 2019-11-04 23:51:10 +01:00
Jacek Galowicz d4a5ea5219 nixos/boot: Port test to python 2019-11-04 23:51:10 +01:00
Jana Traue cdd4d4fadf nixos/wireguard: convert generated test to python 2019-11-04 23:51:10 +01:00
Jana Traue baec88a119 nixos/wireguard: convert default test to python 2019-11-04 23:51:09 +01:00
Jana Traue 8b12f0ddcc nixos/quake3: convert test to python 2019-11-04 23:51:09 +01:00
Julian Stecklina 2af2d59fd6 nixos/emacs-daemon: convert test to python 2019-11-04 23:51:09 +01:00
Jana Traue 9b33b5d38c nixos/gitea: convert test to python 2019-11-04 23:51:09 +01:00
Jacek Galowicz 8eead58520 nixos/postgres: Port test to python 2019-11-04 23:51:09 +01:00
Jacek Galowicz 75d3e810d6 nixos/bittorrent: Port test to python 2019-11-04 23:51:09 +01:00
Jacek Galowicz be48c5c571 nixos/login: Port test to python 2019-11-04 23:51:09 +01:00
Jacek Galowicz 7d19c5aaa7 nixos/test: Pythonify documentation 2019-11-04 23:50:50 +01:00
Florian Klink ac97edf013 nixos/test: use ptpython as repl 2019-11-04 23:50:27 +01:00
Jacek Galowicz 3a28fefe7d nixos/test: Port test driver to python
Thanks @blitz and @jtraue for help with implementing machine methods
2019-11-04 23:50:27 +01:00
Robin Gloster db502b034f
Merge pull request #71139 from philandstuff/ssh-agent-pkcs11-whitelist
ssh-agent: add agentPKCS11Whitelist option
2019-11-04 22:16:06 +01:00
Gabriel Ebner cb8423d19b
Merge pull request #72698 from gebner/digimend-drivers
digimend drivers for graphics tablets
2019-11-04 21:19:06 +01:00
Marek Mahut e51f707437
Merge pull request #72729 from mmahut/trac
nixos/trac: init
2019-11-04 17:53:49 +01:00
Aaron Andersen 5c3715379d nixos/httpd: allow user to specify a minimal list of apache modules 2019-11-04 11:21:20 -05:00
Max Veytsman de1cbcc692 nixos/nat: fix typo in comment
This iptables directive is marking packets coming from the internal interfaces so they can later be NATed by the rule in 22378e6996/nixos/modules/services/networking/nat.nix (L38-L42) .

Fix the comment accordingly.
2019-11-04 17:00:22 +01:00
Linus Heckemann 6f41b1c842
Merge pull request #68193 from chkno/nixos-option-rewrite
nixos-option C++ rewrite with --all
2019-11-04 16:55:04 +01:00
Robin Gloster 754e315fb5 release-notes 20.03: added notice for rewritten nixos-option 2019-11-04 15:14:42 +01:00
Chuck 1e7985942b snake_case -> camelCase 2019-11-04 15:11:45 +01:00
Chuck 445145d5b9 Support aggregate types attrsOf and listOf 2019-11-04 15:11:45 +01:00
Chuck a3e31df4d7 (clang-format for has_example) 2019-11-04 15:11:45 +01:00
Chuck 57a5752300 Add maintainer 2019-11-04 15:11:45 +01:00
Chuck 5646240870 Only print example when there is one 2019-11-04 15:11:45 +01:00
Chuck 4d17d5b31f snake_case -> camelCase 2019-11-04 15:11:45 +01:00
Chuck 84d55716a9 Don't print header on stderr
Automated consumers can use 'sed 1d' or similar to remove this header.

This probably makes this output *easier* to consume correctly.  Having
this header show up in consumers' terminal or log output is probably not
useful, but hiding it without hiding all error messages would have been
more troublesome that just stripping it from stdout.

I.e., previously, unsophisticated use would show undesired output:
  $ some-other-tool
  This attribute set contains:
  This attribute set contains:
  This attribute set contains:
  This attribute set contains:
  <Actual some-other-tool output>

The simplest way to hide this undesired output would have been
nixos-option ... 2>/dev/null, which would hide all error messages.
We do not wish to encourage that.

Correct use would have been something like:
  nixos-option ... 2> >( grep --line-buffered -v 'This attribute set contains:')

After this change, correct use is simpler:
  nixos-option ... | sed 1d
or
  nixos-option ... | sed '1/This attribute set contains:/d'
if the caller don't know if this invocation of nixos-option will yield
an attribute listing or an option description.
2019-11-04 15:11:45 +01:00
Chuck 2ddd2d0760 Explain why header goes on stderr 2019-11-04 15:11:45 +01:00
Chuck 94a068fe36 Pass values by reference
Switch from convention "appease clang-tidy --checks='*'" to
"References are like non-nullptr pointers".  The clang-tidy check
"google-runtime-references" complains about non-const reference
arguments, but this is not a convention used in Nix.
2019-11-04 15:11:45 +01:00
Chuck 3d3ce8df7f Pass Context by reference
Switch from convention "appease clang-tidy --checks='*'" to
"References are like non-nullptr pointers".  The clang-tidy check
"google-runtime-references" complains about non-const reference
arguments, but this is not a convention used in Nix.
2019-11-04 15:11:45 +01:00
Chuck c967e3fd3e Hold state and autoArgs by reference
Switch from convention "appease clang-tidy --checks='*'" to
"References are like non-nullptr pointers".  The clang-tidy check
"google-runtime-references" complains about non-const reference
arguments, but this is not a convention used in Nix.
2019-11-04 15:11:45 +01:00
Chuck c457766a1f Use std::get_if 2019-11-04 15:11:45 +01:00
Chuck 88183eb484 Per reviewer request, cast the other side.
I don't think this matters.  As long as one or the other of these is
a std::string, I get an operator== that looks at content rather than
pointer equality.  I picked casting the constant over casting the dynamic
thing in hopes that the compiler would have a better chance at optimizing
away any runtime cost.

Deferring to reviewer.
2019-11-04 15:11:45 +01:00
Chuck aa8e1d5f1e Always say which path component had trouble 2019-11-04 15:11:45 +01:00
Chuck c352bfeaf0 Switch from east const to west const
For consistency with the Nix C++ convention.

:~(
2019-11-04 15:11:45 +01:00
Chuck b8db81573a Support submodules (Fixes #13121) 2019-11-04 15:11:45 +01:00
Chuck 88349921a4 clang-format 2019-11-04 15:11:45 +01:00
Chuck 6b405f9789 Fix missing "using ThrownError" 2019-11-04 15:11:45 +01:00
Chuck 0adf77e2ee Narrow the «not defined» check to just ThrownError 2019-11-04 15:11:45 +01:00
Chuck c7c684aaa3 Preserve type of rethrown exceptions 2019-11-04 15:11:45 +01:00
Chuck d89ccc1554 Correct syntax for license specification 2019-11-04 15:11:45 +01:00
Chuck 2336982957 Add license
This is important because this contains some code copied from nix (as an
interim expediency until that functionality can be exported via nix's
API).  The license specified here must be compatible with this borrowing.
Select the same license that nix is released under: lgpl2Plus.
2019-11-04 15:11:45 +01:00
Chuck f3eedb6020 Parallel build is the default, so no need to specify 2019-11-04 15:11:45 +01:00
Chuck e1ecc2b6c1 Remove list sorting 2019-11-04 15:11:45 +01:00