Jaka Hudoklin
be067811ff
Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4
...
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-17 17:18:24 +01:00
Jaka Hudoklin
7955be7a82
Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0
...
bosun: 0.3.0 -> 0.5.0-alpha, udpate module
2015-11-17 17:17:44 +01:00
Jaka Hudoklin
0667fe29c9
Merge pull request #11061 from offlinehacker/nixos/heapster/add
...
heapster module: init
2015-11-17 17:17:01 +01:00
Jaka Hudoklin
dfd1f14ca5
Merge pull request #11058 from offlinehacker/nixos/kubernetes1/git
...
kubernetes module: kubelet add git and ssh to path
2015-11-17 17:14:44 +01:00
Jaka Hudoklin
69a1b3977b
Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0
...
grafana: 2.0.0-beta1 -> 2.5.0
2015-11-17 17:14:23 +01:00
Jaka Hudoklin
aa4bad4c17
heapster module: init
2015-11-16 16:58:10 +01:00
Jaka Hudoklin
dd1f8b2693
kubernetes module: kubelet add git and ssh to path
2015-11-16 15:19:56 +01:00
Jaka Hudoklin
9671d36011
grafana module: update
2015-11-16 14:59:25 +01:00
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
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