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

1782 commits

Author SHA1 Message Date
Jaka Hudoklin 0775a89c11 bosun module: update module 2015-11-16 14:24:02 +01:00
Jaka Hudoklin 9c1943fb6f influxdb: 0.8.3 -> 0.9.4, fix module 2015-11-16 14:22:08 +01:00
Domen Kožar b76519069d Merge pull request #9733 from basvandijk/wordpress-fix-extraConfig
wordpress: execute the extraConfig before loading wp-settings.php
2015-11-16 13:16:10 +01:00
Rickard Nilsson 3e18ddae49 Merge pull request #11005 from robbinch/fix-nix-serve
Change argument --port to --listen in nix-serve.nix
2015-11-16 11:43:31 +01:00
William A. Kennington III 4ead61ca39 Merge remote-tracking branch 'upstream/master' into master.upstream 2015-11-14 12:33:53 -08:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Guillaume Maudoux 60ba5ad479 lighttpd: fix mod_rewrite appearing twice 2015-11-14 15:52:25 +01:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Lengyel Balázs 162542bf8f fix: ihaskell's and xmonad's dependence on haskell-ng 2015-11-13 19:14:40 +01:00
Arseniy Seroka 9dd3e5fd3f Merge pull request #10993 from oxij/nixos-actkbd-tinyfix
[trivial] nixos: add actkbd package to environment in actkbd module
2015-11-13 17:39:44 +03:00
Robbin C c75d1e761a Change argument --port to --listen in nix-serve.nix 2015-11-13 21:25:50 +08:00
James Cook 225642e25a Update comment for gdm service.
Emphasize experimental nature slightly less, but say it's only really
tested with Gnome.
2015-11-12 20:58:43 -08:00
Jan Malakhovski 95a723d516 nixos: add actkbd package to environment in actkbd module 2015-11-12 21:05:07 +00:00
Nikolay Amiantov 9800862397 nixos/autofs: revive and update to systemd 2015-11-11 16:18:57 +03:00
Pascal Wittmann 14ecf0c7fb services.tlsdated: use google.com as default host
www.ptb.de returns incorrect dates.
2015-11-11 12:07:08 +01:00
Chris Martin 00c42fdda1 redshift: document lat/long and temp bounds 2015-11-10 22:28:37 -08:00
Tomasz Kontusz 6681c66db8 networkmanager service: add unmanaged option 2015-11-10 12:20:55 +01:00
Alexei Robyn 91fe21c854 quassel service: Support multiple listen addresses, fixes #10924 2015-11-10 11:10:21 +01:00
Nikolay Amiantov 23845d7084 tlp: add x86_energy_perf_policy, refactor 2015-11-09 17:29:59 +03:00
Robert Glossop 5623e1b145 Add the CLFSWM window manager 2015-11-08 18:49:40 -05:00
Peter Simons adb74ad2f9 Merge pull request #10620 from gebner/postfix-3.0.3
postfix: 2.11.5 -> 3.0.3
2015-11-08 18:10:26 +01:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Rickard Nilsson fa3dad1f9c nixos/bosun: Make the check frequency configurable 2015-11-07 23:59:23 +01:00
Domen Kožar 07405ee187 Merge pull request #9463 from khumba/nm-connection-sharing
Fix NetworkManager connection sharing
2015-11-06 11:16:50 +01:00
Domen Kožar e695b245a9 Merge pull request #9805 from Mathnerd314/quassel-fix
quassel: Start after its databases
2015-11-06 11:14:54 +01:00
Domen Kožar 23adabcb8f Merge pull request #10746 from jgertm/fix-wol-doc
Fixed wrong documentation for Wake-On-LAN feature
2015-11-06 10:57:48 +01:00
William A. Kennington III 2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Nikolay Amiantov 452dbfd288 nixos/tlp: workaround early build trigger 2015-11-05 16:22:10 +03:00
Thomas Tuegel 90cc190db2 Merge pull request #10731 from ttuegel/plasma-5.4
KDE Plasma 5.4, Frameworks 5.15, and Applications 15.08
2015-11-04 10:06:28 -06:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Bjørn Forsman 27f41d8c0a nixos: add services.jenkins.jobBuilder option
This option allows to define (declarative) Jenkins jobs, using Jenkins
Job Builder (JJB) as backend.

Example:

  services.jenkins = {
    enable = true;
    jobBuilder = {
      enable = true;
      yamlJobs = ''
        - job:
            name: jenkins-job-test
            builders:
              - shell: echo 'Hello world!'
      '';
    };
  };

Jobs can be defined using YAML, JSON and Nix.

Note that it really is declarative configuration; if you remove a
previously defined job, the module will remove the jobdir under
$JENKINS_HOME.

Jobs managed through the Jenkins WebUI (or by other means) are not
touched by this module.

Changes v1 -> v2:
* add nixJobs
* let jsonJobs take a list of strings (allows merge)
* 4 space indent in shell code
2015-11-03 16:32:31 +01:00
Franz Pletz d89f269b26 chrony service: Members of group chrony can use chronyc 2015-11-03 15:07:18 +01:00
Franz Pletz c459e269eb chrony service: Integration with other ntp daemons 2015-11-03 15:07:18 +01:00
Peter Simons 2bb705da15 postfix: don't create a symlink inside of /var/spool/mail if /var/mail exists already 2015-11-02 14:33:30 +01:00
Bjørn Forsman f25b36df3c nixos/jenkins: force .war (re)extraction at start-up
Or else we might run stale Jenkins.
2015-11-02 10:31:13 +01:00
Luca Bruno ff02152def nixos/postgresql: fix extraPlugins example with a working one 2015-11-01 14:15:43 +01:00
Domen Kožar 581ae33e96 Merge pull request #10107 from ryantm/calibre-server
calibre-server service: init
2015-11-01 09:19:03 +01:00
Ryan Mulligan 922bf3986b calibre-server service: add type to libraryDir option 2015-10-31 14:21:56 -07:00
Benno Fünfstück d767aae721 sddm module: support autologin configuration 2015-10-31 16:04:52 +01:00
Thomas Tuegel 95725b2581 nixos/kde5: install oxygen-icons 2015-10-31 08:48:54 -05:00
Thomas Tuegel 5e65741e41 nixos/kde5: install a more complete desktop 2015-10-31 08:48:53 -05:00
Thomas Tuegel b4b2e7c23d nixos/kde5: install dolphin-plugins 2015-10-31 08:48:49 -05:00
Tim Jäger 4591e72917 Fixed wrong documentation for Wake-On-LAN feature 2015-10-31 12:55:34 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Thomas Tuegel b36c2dd0a0 nixos/kde5: install frameworkintegration 2015-10-30 16:10:37 -05:00
Thomas Tuegel 88b99f0054 nixos/kde5: install oxygen-icons 2015-10-30 16:10:37 -05:00
Thomas Tuegel 5df5e1f165 plasma54: propagate packages to user profile 2015-10-30 16:10:37 -05:00
Thomas Tuegel 2386bd7c61 nixos/kde5: refine Phonon backend options 2015-10-30 16:10:37 -05:00
Thomas Tuegel 5d4950a02c nixos/kde5: only install required packages 2015-10-30 16:10:37 -05:00
Thomas Tuegel b102fa5a07 nixos/kde5: ready for plasma-5.4 2015-10-30 16:10:37 -05:00
Eelco Dolstra c20403631d Factor out "man" into a separate module and add "man" outputs to system.path
Fixes #10270.
2015-10-30 15:21:12 +01:00
Domen Kožar 01b0355140 nm-openvpn: add user/group, closes #10689
(cherry picked from commit 551dad3ffd)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-29 09:59:08 +01:00
Benno Fünfstück a92c024c7f sddm: allow extra config options 2015-10-28 22:04:40 +01:00
Peter Simons 84903a4846 nixos: use "example.net" host name in autossh documentation 2015-10-28 20:04:36 +01:00
Peter Simons b8dd60aaa6 nixos: remove redundant services.autossh.enable option
The service is enabled automatically when 'session' is non-empty.
2015-10-28 19:50:06 +01:00
Peter Simons be1fa3c9da Merge pull request #10650 from grwlf/autossh-nixos
autossh.nix: AutoSSH service as a NixOS module
2015-10-28 11:31:51 +01:00
Sergey Mironov d355ed81cb autossh.nix: add the module, which run autossh sessions as systemd services 2015-10-28 00:23:13 +03:00
Arseniy Seroka 42eabf1c4a Revert "i3wm: Add debug & logging options" 2015-10-27 13:40:04 +03:00
Arseniy Seroka 50f5122d72 Merge pull request #10635 from layus/i3log
i3wm: Add debug & logging options
2015-10-27 12:51:50 +03:00
Guillaume Maudoux eb46e0fc72 i3wm: Add debug & logging options 2015-10-26 22:33:11 +01:00
michael bishop b81f51cecf teamviewer: fix the expressions 2015-10-26 15:22:01 -03:00
Gabriel Ebner 929e734f19 postfix: 2.11.5 -> 3.0.3 2015-10-26 11:46:17 +01:00
aszlig 60d407b209
nixos/postgresql: Fix execution of initialScript.
Regression introduced by b21fd5d066.

The initialScript is only executed whenever there is a .first-startup in
the dataDir, so silently dropping the file essentially breaks
initialScript functionality.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-25 16:05:14 +01:00
Domen Kožar 6fb7b9b664 networkmanager: don't check if subject is active (false in my X session)
(cherry picked from commit 4c2bbb248c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-23 20:16:49 +02:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Nikolay Amiantov 763ad3372a nixos/parsoid: use nodejs 0.10 2015-10-22 14:34:02 +03:00
Hajo Möller de9e05153d service.asterisk: fix dir creation 2015-10-19 19:05:23 +02:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Tobias Geerinckx-Rice a65cf63f55 copy-com service: order after network-online.target
I doubt that ordering non-sysvinit services after network.target ever
makes sense. In this case, CopyConsole requires DNS lookups and fails
if these are not yet possible.
2015-10-13 21:02:01 +02:00
aszlig e4caf0fde0
nixos/synergy: Restart services on failure.
Synergy seems to get more and more unstable in recent versions, so we
might want to debug this properly. However, it makes sense to restart
the service nevertheless, because synergy is about keyboard and mouse
sharing and it's quite annoying to either SSH in to restart the service
or even needing to unplug the keyboard and plug in into the machine with
the failing service.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 04:42:39 +02:00
Domen Kožar 49f5d85041 Merge pull request #10208 from offlinehacker/nixos/grafana/fix_option_name
grafana service: fix package option name
2015-10-08 12:21:58 +02:00
Bjørn Forsman 04e748e61f nixos/jenkins: reduce default environment
Don't pull in all of environment.sessionVariables, only add what's
needed for nix and HTTPS to work (which was the point of the previous
patch).
2015-10-06 22:11:03 +02:00
Thomas Strobel c6b2365e9a supplicant module: extended module for wpa_supplicant
Add new configuration options for wpa_supplicant and allow to
configure and start one wpa_supplicant per device.
2015-10-06 20:12:40 +02:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Domen Kožar a61e26a63d Merge pull request #10227 from bjornfor/jenkins-envvars
nixos/jenkins: rework environment handling
2015-10-06 13:38:55 +02:00
lethalman 241821cbb4 Merge pull request #10195 from cleverca22/master
build the crontab localy, there is nothing to gain from building it remotely
2015-10-06 11:01:56 +02:00
Luca Bruno eccd68eeb7 gnome3: add bgSupport=true. Closes #10242 2015-10-06 10:21:38 +02:00
Bjørn Forsman 67723df930 nixos/jenkins: rework environment handling
Jenkins gets (by default) an additional environment of

  { NIX_REMOTE = "daemon"; }

This has the following problems:

  1. NIX_REMOTE disappears when users specify additional environment
     variables, because defaults have low merge priority.
  2. nix cannot be used without additional NIX_PATH envvar, which is
     currently missing.
  3. If you try to use HTTPS, you'll see that jenkins lacks
     SSL_CERT_FILE envvar, causing it to fail.

This commit adds config.environment.sessionVariables and NIX_REMOTE to
the set of variables that are always there for jenkins, making nix and
HTTPS work out of the box.

services.jenkins.environment is now empty by default.
2015-10-04 20:04:00 +02:00
Jaka Hudoklin f660729e35 grafana service: fix package option name 2015-10-03 15:26:14 +02:00
Ryan Mulligan a41d07074d calibre-server service: configuration improvements
based on @eldostra feedback:
* remove user and group configuration, because it is probably
  unnecessary
* remove libraryDir default
* capitalize and shorten service description
2015-10-03 05:48:46 -07:00
michael bishop 54fe2f8c5c build the crontab localy, there is nothing to gain from building it remotely 2015-10-03 03:33:13 -03:00
Gabriel Ebner 0dfddc5a54 opensmtpd: support filters. 2015-10-02 13:01:50 +02:00
lethalman 0474cb3c6d Merge pull request #10078 from nmikhailov/nm_service
Enable setting extended NetworkManager hooks
2015-10-02 11:45:28 +02:00
Rickard Nilsson c0a83cbc49 opentsdb nixos module: Add option for defining OpenTSDB's configuration 2015-09-30 18:31:27 +02:00
Peter Simons 4578784820 nixos: add services.bind.extraConfig option
This option allows users to add arbitrary configuration statements into
the generated named.conf file.
2015-09-29 11:51:40 +02:00
ts468 6d5a742c2e Merge pull request #10000 from ts468/upstream.vswitch
nixos networking: add vswitch option
2015-09-29 00:52:58 +02:00
Eelco Dolstra 1b728846a8 Shut up a KDE warning when a user first logs in
It was complaining about not having write permission to
$HOME/.local/share/user-places.xbel (because .local/share didn't exist
yet).
2015-09-28 15:14:44 +02:00
Ryan Mulligan 9c22cd380c calibre-server service: init 2015-09-27 20:31:17 -07:00
Nikita Mikhailov 89b306a7ff Enable setting extended NetworkManager hooks 2015-09-26 23:59:31 +06:00
Matej Cotman ee7e17c6a7 Merge pull request #9984 from grwlf/syncthing
syncthing: update systemd service config according to upstream example
2015-09-26 18:38:20 +02:00
Thomas Strobel 59bc47c9ed nixos networking: add vswitch option
Add a configuration option for Open vSwitch that is
similar to the option for the Linux kernel ethernet
bridge.
2015-09-25 11:55:27 +02:00
Jan Malakhovski 9cc7859b2e nixos: show the manual in system's /share/doc (close #9928) 2015-09-24 12:29:57 +02:00
Eelco Dolstra 89e983786a Manual: Remove store path references 2015-09-24 11:50:58 +02:00
Peter Simons 5f3990185f Merge pull request #10009 from jerith666/postfix-recip-delim
postfix service: fix recipientDelimiter not to be dependent on sslCert
2015-09-23 11:54:39 +02:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Matt McHenry 63d1ce6d38 postfix service: fix recipientDelimiter not to be dependent on sslCert 2015-09-22 21:06:32 -04:00
Matej Cotman c666955b75 xtreemfs: set mrc and osd as dir dependencies 2015-09-22 21:46:52 +02:00
Matej Cotman a35cebb3b1 xtreemfs: use mkEnableOption instead of mkOption 2015-09-22 21:46:52 +02:00
Matej Cotman d31cc0d19a xtreemfs: add nixos module 2015-09-22 21:46:52 +02:00
Nikolay Amiantov 29373add7d Merge pull request #9918 from khumba/synaptics-conf
xf86-input-synaptics: make use of 50-synaptics.conf
2015-09-22 01:05:00 +03:00