1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

7776 commits

Author SHA1 Message Date
Aaron Andersen 9abf0a1664
Merge pull request #75182 from clefru/typofix
apache-kafka.nix: Add missing quote inside tmpfiles rule
2019-12-07 22:50:50 -05:00
Clemens Fruhwirth 39cd4574aa apache-kafka.nix: Add missing quote inside tmpfiles rule 2019-12-07 23:59:10 +01:00
Janne Heß d21f5cf36f nixos/nextcloud: Do not run sudo if not needed
Only use sudo if we are currently not running as the nextcloud user.
This is problematic when occ is called from a systemd service with
NoNewPrivileges=true
2019-12-07 21:10:34 +01:00
Emery Hemingway 6c1c99d6b4 nixos/yggdrasil: fix for configFile option
The configFile was not being merged with the declarative configuration at
runtime.
2019-12-07 19:56:49 +01:00
Vanya Klimenko 125205cd60
nixos/apache-httpd: fix typo in extraConfig description 2019-12-06 21:47:15 +03:00
Florian Klink 77f26cc542
Merge pull request #74852 from srhb/gitea-fix-start
nixos/gitea: Fix startup
2019-12-05 22:56:46 +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
Maximilian Bosch 03ad033f97
Merge pull request #74992 from rnhmjoj/maintainers
nixos: add myself to maintainers
2019-12-04 21:09:48 +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
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
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
Sarah Brofeldt 218fe53e24 nixos/gitea: Add srhb as maintainer 2019-12-02 21:45:06 +01:00
Sarah Brofeldt 1573102a89 nixos/gitea: Fix startup 2019-12-02 21:45:06 +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
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
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
Janne Heß e42036ee0e nixos/gitea: Sandbox the systemd service 2019-12-01 10:18:48 +01:00
Jan Tojnar 8cbc862b83
dconf: move to top-level 2019-12-01 01:01:40 +01:00
Alex Guzman 752b8688b5 nixos/roon-server: fix broken user generation
Didn't notice this till I tried removing my custom roon user from the one I was testing with. There's not a 'groups' option for users, only group (primary group) and extraGroups. Use these.
 (#68337)
2019-11-29 23:50:10 +01:00
rnhmjoj 1598f3d257
nixos/bluetooth: don't install obex tools by default 2019-11-29 21:08:58 +01:00
Renaud e37e7b413c
Merge pull request #72987 from rnhmjoj/dnschain
nixos/dnschain: use forwardZonesRecurse in pdns-recursor
2019-11-29 19:56:21 +01:00
Andreas Rammhold 3c6a33e049
Merge pull request #74177 from jtojnar/neard
nixos/neard: init
2019-11-28 07:53:32 +01:00
Aaron Andersen 5988940ca7
Merge pull request #73577 from helsinki-systems/matomo-consistency
matomo: Fix consistency check
2019-11-27 18:07:20 -05:00
Aaron Andersen a568a03674
Merge pull request #73872 from filalex77/modules/services/hardware/bluetooth/ini-generator
nixos/bluetooth: add support for INI generator
2019-11-27 18:02:20 -05:00
Serval 899d38170c
v2ray: fixups and change to buildGoModule 2019-11-28 02:10:37 +08:00
worldofpeace 1b5df99e7a
Merge pull request #70295 from worldofpeace/mutter-eglstreams
Mutter eglstreams
2019-11-27 05:29:58 +00:00
Dima 0541d071af samba3, fusesmb: removing
Samba 3 has been discontinued since Q1/2015. So I think it's time
to just wipe it from the pkgs. FuseSMB is pretty much abandoned,
upstream does not exist and it's also not as useful as it used to
be anyways.
2019-11-26 19:56:16 +01:00
Robin Gloster 83b14e578f
Merge pull request #74198 from WilliButz/fix/nginx-exporter-startup
nixos/prometheus-exporters: fix nginx exporter startup
2019-11-26 17:37:23 +01:00
Robin Gloster c33110db9e
Merge pull request #73299 from toonn/wpa_supplicant-unit-start-bonding
nixos/wpa_supplicant: fix unit-start script
2019-11-26 16:48:48 +01:00
WilliButz adc5ae70bf
nixos/prometheus-exporters: fix nginx exporter startup
When nginx is enabled on the same host the nginx exporter is,
the exporter needs to start after nginx.
2019-11-26 10:11:12 +01:00
Florian Klink 02f869ff30 osquery: remove
osquery was marked as broken since April.

If somebody steps up to fix it, we can always revive it from the
histroy, but there's not much value in shipping completely broken things
in current master.

cc @ma27
2019-11-24 22:38:07 +01:00
worldofpeace 38178a9a5b
Merge pull request #74030 from ckauhaus/connman-to-services.networking
connman: move "networking.connman" options to "services.connman"
2019-11-24 21:24:33 +00:00
Christian Kauhaus edbf94d2ee connman: move options to services
As part of the networking.* name space cleanup, connman should be moved
to services.connman. The same will happen for example with
networkmanager in a separate PR.
2019-11-24 16:23:32 -05:00
John Ericson 1206faa6d5
Merge pull request #74057 from Ericson2314/wrapper-pname-support
treewide: Purge most parseDrvName
2019-11-24 13:31:35 -05:00
John Ericson d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson 9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Florian Klink c3e17efaab nixos/beegfs: remove module
packages are marked as broken for quite some time.
2019-11-24 17:33:51 +01:00
Tom Fitzhenry 58498ae061 nixos/openarena: fix service's binary name
The binary name was recently changed from openarena-server to oa_ded in
https://github.com/NixOS/nixpkgs/pull/71122 .

That change broke the openarena module and consequently the openarena
test too. This commit fixes both.

As an alternative, we considered reverting the name change in
https://github.com/NixOS/nixpkgs/pull/72824 but we decided oa_ded was
a better name for the binary (it's the name upstream use).
2019-11-24 16:55:20 +01:00
Jan Tojnar 2c81a6116b
nixos/neard: init 2019-11-23 23:28:13 +01:00
worldofpeace 519448d2e3 nixos/gdm: don't raise an Exception in set-session script
https://github.com/NixOS/nixpkgs/pull/73378#discussion_r349825541
2019-11-22 18:05:31 -05:00
worldofpeace bec88e1110
Merge pull request #73378 from worldofpeace/gdm-default-session
nixos/gdm: make desktopManager.default work
2019-11-22 22:49:15 +00:00
worldofpeace d8b50bfe47 nixos/gdm: make desktopManager.default work
Unfortunately, you can't configure the default user-session
with GDM like lightdm. I've opened a feature request [0]
but I'd like to be able to do this now.

We use a GObject Python script using bindings to AccountsService
to achieve this. I'm hoping the reliable heuristic for session names
is the file's basename. We also have some special logic for which
method to use to set the default session. It seems set_x_session is
deprecated, and thusly the XSession key, but if that method isn't used
when it's an xsession it won't be the default in GDM.

[0]: https://gitlab.gnome.org/GNOME/gdm/issues/535
2019-11-22 17:47:03 -05:00
worldofpeace 9995881b79
Merge pull request #73876 from jtojnar/phonon-backends
Fix Plasma NixOS tests
2019-11-22 19:44:19 +00:00
Oleksii Filonenko 95fc2d3fe1
hardware/bluetooth: add support for INI generator
- Add services.hardware.bluetooth.config option
- Use lib.generators.toINI with both config and extraConfig options

hardware/bluetooth: a couple suggestions

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2019-11-22 17:11:44 +02:00
Aaron Andersen 7b9c17c475 nixos/beanstalkd: keep jobs in persistent storage (#73884) 2019-11-22 09:27:32 +00:00
Maximilian Bosch fce01d8f5e
Merge pull request #73788 from eonpatapon/nextcloud-occ
nixos/nextcloud: add occ in path of nextcloud-setup
2019-11-22 10:06:39 +01:00