1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Commit graph

15339 commits

Author SHA1 Message Date
Silvan Mosberger 89b1bd1b92
Merge pull request #72734 from nyanloutre/zfs_zed_config_module
nixos/zfs: ZED config module
2019-12-05 07:15:39 +01:00
worldofpeace b12aef05a4
Merge pull request #73968 from mat8913/upower-config-master
nixos/upower: Allow customization of UPower.conf
2019-12-05 05:25:00 +00:00
Florian Klink 3140fa89c5
Merge pull request #73097 from andrew-d/andrew/gvisor-redux
gvisor: init at 2019-11-14
2019-12-05 01:28:43 +01:00
Marek Mahut 25f7bd7c4b
Merge pull request #74753 from mmilata/moinmoin-python-test
nixosTests.moinmoin: port to python
2019-12-05 00:13:41 +01:00
Maximilian Bosch 03ad033f97
Merge pull request #74992 from rnhmjoj/maintainers
nixos: add myself to maintainers
2019-12-04 21:09:48 +01:00
nyanloutre c082e13ecb
nixos/zfs: Adding ZED configuration options
Co-authored-by: sjau <github.com@sjau.ch>
2019-12-04 20:29:19 +01:00
Jason Samsa 7e564ae162 remove vulgarity from wordpress nixos module 2019-12-04 12:45:40 -06:00
rnhmjoj 1a2e7c3b00
nixos: add myself to maintainers 2019-12-04 17:09:53 +01:00
Jacek Galowicz 5d91b29e0d nixosTests.openldap: port test to python 2019-12-04 16:22:26 +01:00
Jacek Galowicz 15f105d41f nixosTests.ldap: port integration test to python 2019-12-04 16:22:13 +01:00
Florian Klink 746a888f86
Merge pull request #74898 from tfc/nixos-test-retry
nixos/test: Use retry() in all looping functions that need timeouts
2019-12-04 16:18:42 +01:00
Andrew Dunham c37902dfd1 nixosTests.gvisor: add test for gvisor and gvisor as a Docker runtime 2019-12-03 23:55:24 -08:00
Matthew Harm Bekkema f83a83f964 upower: load config from /etc
In the process of making UPower.conf customizable (#73968), it came up
that UPower doesn't load its config from /etc by default.

The UPower derivation is modified to make it load its config from /etc
at runtime, but still install the default config to its nix store path
as before.

The UPower module is modified to put the config in /etc.
2019-12-04 12:26:30 +11:00
Matthew Harm Bekkema aecfea098e nixos/upower: Allow customization of UPower.conf
Documentation of options and default values taken from the upstream
UPower.conf. The documentation was modified slightly to make more sense
when displayed on https://nixos.org/nixos/options.html.

A copy of upstream UPower.conf can be found here:
https://cgit.freedesktop.org/upower/tree/etc/UPower.conf?id=28bd86c181e2510ef6a1dc7cfa26f97803698a79
2019-12-04 12:26:30 +11:00
Florian Klink b7c19e1b91
Merge pull request #74866 from x123/x123-test-tiddlywiki
nixos/tests/tiddlywiki: port to python
2019-12-04 01:05:00 +01:00
Florian Klink 49f3d9203a
Merge pull request #74913 from paumr/master
improved nginx.basicAuthFile description
2019-12-04 01:03:45 +01:00
Florian Klink f7a232297a
Merge pull request #74938 from x123/x123-i3wm-test-to-python
nixos/tests/i3wm: port to python
2019-12-04 00:50:31 +01:00
Florian Klink c7d0ee722d
Merge pull request #74082 from flokli/nixos-test-port-gocd
nixosTest.gocd-{agent,server}: port to python
2019-12-04 00:35:56 +01:00
Florian Klink b62c02ce04 nixosTests.gocd-agent: mark as broken 2019-12-04 00:35:07 +01:00
x123 b6d5e3844f nixos/tests/i3wm: port to python 2019-12-03 21:51:26 +01:00
x123 c0d5332ab3 remove duplicate test in tiddlywiki 2019-12-03 17:18:59 +01:00
Jacek Galowicz a16695578b nixos/pam-oath-login: Port test to python 2019-12-03 17:06:04 +01:00
Jacek Galowicz e05ae69904 nixos/test: Use retry() in all looping functions that need timeouts 2019-12-03 16:59:43 +01:00
Eelco Dolstra 946c5fb8f7
Tweag releaase notes 2019-12-03 15:09:55 +01:00
Eelco Dolstra 56588e9eaa
Merge pull request #74850 from davidak/PRETTY_NAME
nixos/version: PRETTY_NAME in /etc/os-release uses the release now
2019-12-03 15:08:52 +01:00
paumr 5a1c15da12 improved nginx.basicAuthFile description 2019-12-03 14:05:46 +01:00
Mario Rodas 93ff0446ca
Merge pull request #66089 from servalcatty/v2ray
v2ray: init at 4.21.3
2019-12-03 04:42:50 -05:00
x123 2ad9a627de nixos/tests/tiddlywiki: port to python 2019-12-03 00:20:01 +01:00
Florian Klink 9159afd459
Merge pull request #74839 from raboof/installNetworkingNote
Spell out you need to enable wifi explicitly at install time
2019-12-02 23:24:02 +01:00
Florian Klink f8218178f7 nixosTests.gocd-server: port to python 2019-12-02 23:13:09 +01:00
Florian Klink 46daafa269 nixosTest.gocd-agent: port to python 2019-12-02 23:13:09 +01:00
x123 362e377154 nixos/tests/xrdp: port to python 2019-12-02 22:20:36 +01:00
Florian Klink fdb65314fc
Merge pull request #74759 from mmilata/openarena-python-test
nixosTests.openarena: port to python
2019-12-02 20:29:04 +01:00
Florian Klink 9144d84a60
Merge pull request #74762 from mmilata/mediawiki-python-test
nixosTests.mediawiki: port to python
2019-12-02 20:28:31 +01:00
Florian Klink 85a345327f
Merge pull request #74764 from mmilata/radicale-python-test
nixosTests.radicale: port to python
2019-12-02 20:27:51 +01:00
davidak 0ba3761ba8 nixos/version: PRETTY_NAME in /etc/os-release uses the release now instead of full version
to be more suitable for presentation to the user
2019-12-02 20:04:44 +01:00
worldofpeace 5350db96e2
Merge pull request #74838 from jtojnar/pantheon-debug
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
2019-12-02 18:05:41 +00:00
Arnout Engelen 89ed88f86f Spell out you need to enable wifi explicitly at install time 2019-12-02 17:50:22 +01:00
Jan Tojnar 9129616919
nixos/pantheon fix GNOME_SESSION_DEBUG conflict
When session debugging was enabled in GNOME but not in Pantheon

	{
	  services.xserver = {
	    desktopManager.pantheon = {
	      enable = true;
	    };
	    desktopManager.gnome3 = {
	      enable = true;
	      debug = true;
	    };
	  };
	}

it caused a conflict:

	error: The option `environment.sessionVariables.GNOME_SESSION_DEBUG' has conflicting definitions, in `<nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix>' and `<nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix>'.
2019-12-02 17:25:24 +01:00
Daniël de Kok 02553c114d rl-2003: mention the removal of dump1090's internal web server 2019-12-02 14:47:19 +01:00
Jörg Thalheim 7ee6319745
nixosTests.matomo: port to python (#74756)
nixosTests.matomo: port to python
2019-12-02 05:48:00 +00:00
worldofpeace 15951cba08
Merge pull request #63607 from rnhmjoj/remove-obex
nixos/bluetooth: don't install obex tools by default
2019-12-01 22:50:47 +00:00
rnhmjoj 40d4c3c93e
nixos/plasma5: install obex tools when bluetooth is enabled 2019-12-01 22:52:58 +01:00
Martin Milata 0168f41d70 nixosTests.moinmoin: port to python 2019-12-01 16:45:36 +01:00
Florian Klink da3a320d13
Merge pull request #74077 from 7c6f434c/add-test-driver-py-copy-from-vm
Add test driver py copy from vm
2019-12-01 13:56:23 +01:00
Jörg Thalheim 7e6718e425
nixosTests.predictable-interface-names: port to python (#74765)
nixosTests.predictable-interface-names: port to python
2019-12-01 10:40:29 +00:00
Janne Heß e42036ee0e nixos/gitea: Sandbox the systemd service 2019-12-01 10:18:48 +01:00
Martin Milata 8d6bcf80a2 nixosTests.predictable-interface-names: python 2019-12-01 03:16:34 +01:00
Martin Milata be911515eb nixosTests.radicale: port to python 2019-12-01 03:05:39 +01:00
Martin Milata 268062198d nixosTests.mediawiki: port to python 2019-12-01 02:44:49 +01:00