Robin Gloster
4036e9ba8c
Merge branch 'up' into hardened-stdenv
2016-02-20 22:27:33 +00:00
zimbatm
a7715e3e06
Merge pull request #10231 from zimbatm/apache-intermediate-ssl
...
apache-httpd: adopt mozilla's SSL configuration recommendation
2016-02-20 19:14:51 +00:00
Robin Gloster
686c09dd38
wpa_supplicant module: after network-interfaces.target
...
fixes #13136
2016-02-20 17:41:02 +00:00
Arseniy Seroka
cbb06df02f
Merge pull request #13142 from zimbatm/zerotierone-1.1.4
...
Zerotierone 1.1.4
2016-02-20 17:09:59 +03:00
zimbatm
433f979cee
zerotierone: adopt systemd unit from upstream
...
See
5db538d85e/ext/installfiles/linux/systemd/zerotier-one.service
2016-02-19 22:56:19 +00:00
Robin Gloster
bc21db3692
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-19 21:16:14 +00:00
Thomas Tuegel
7bca3cd8dc
kde5: reduce default installation size
2016-02-19 06:21:50 -06:00
Nikolay Amiantov
b457b7a7ea
Merge pull request #13069 from abbradar/m3d
...
OctoPrint and plugins and support for M3D Micro 3D-printer
2016-02-19 14:27:32 +03:00
Bjørn Forsman
b2b1511353
nixos/collectd: add defaultText to package option
...
CC @fpletz
2016-02-18 20:30:05 +01:00
tg(x)
de787adb90
tlsdated: add missing default value for extraOptions
2016-02-18 05:29:12 +01:00
Franz Pletz
ed979124ca
collectd service: Add option package
2016-02-18 03:44:55 +01:00
aszlig
7bdcfb33f4
nixos: Provide a defaultText for type = package
...
We don't want to build all those things along with the manual, so that's
what the defaultText attribute is for.
Unfortunately a few of them were missing, so let's add them.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-17 21:12:24 +01:00
Nikolay Amiantov
53269f1455
octoprint service: init
2016-02-17 17:05:59 +03:00
Rob Vermaas
b2f2d2fef3
Fix azure image, by adding subformat=fixed to disk generation.
2016-02-17 12:02:52 +00:00
Vladimír Čunát
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
Nikolay Amiantov
1c8a21dfad
Merge branch 'pdnsd-service' of https://github.com/nfjinjing/nixpkgs
...
Closes #12932
2016-02-16 20:35:01 +03:00
Nikolay Amiantov
39e9b43082
Merge branch 'gammu-smsd' of https://github.com/zohl/nixpkgs into zohl-gammu-smsd
...
Closes #12998
2016-02-16 19:40:00 +03:00
Franz Pletz
932d2cbd2c
Merge pull request #13000 from mayflower/feat/unbound-dnssec
...
unbound: 1.5.3 -> 1.5.7, hardening, DNSSEC support & cleanup
2016-02-16 02:13:35 +01:00
Arseniy Seroka
6b205a9eba
Merge pull request #12988 from colemickens/cfdyndns
...
cfdyndns: init at 0.0.1
2016-02-16 00:24:32 +03:00
Cole Mickens
c7571611dc
cfdyndns: init at 0.0.1
2016-02-15 12:54:04 -08:00
Arseniy Seroka
a13f9a708b
Merge pull request #12992 from lukasepple/master
...
intel2200BGFirmware: init at 3.1
2016-02-15 22:10:49 +03:00
Franz Pletz
41698c9efa
Merge branch 'master' into hardened-stdenv
2016-02-15 20:05:29 +01:00
lukasepple
0b72e7e247
intel2200BGFirmware: init at 3.1
...
This commit adds the firmware for the Intel 2200BG wireless cards for
the ipw2200 kernel module. Also it changes the
networking.enableIntel2200BGFirmware option to set it as
hardware.firmware since firmware-linux-nonfree does not contain the
appropiate firmware anymore. Also hardware.enableAllFirmware does enable
the intel2200BGFirmware now.
2016-02-15 19:53:07 +01:00
Tuomas Tynkkynen
eb9a85a389
Merge pull request #12742 from dezgeg/pr-uboot-changes
...
U-Boot: 2015.10 -> 2016.01, refactor & support some new boards
2016-02-15 16:10:37 +02:00
Franz Pletz
483e78d0f0
unbound service: add fetching root anchor for DNSSEC
2016-02-15 03:59:42 +01:00
Franz Pletz
9ba533ee4a
unbound service: add types to options
2016-02-15 03:59:35 +01:00
Franz Pletz
fe4b0a4801
unbound service: retab
2016-02-15 03:59:15 +01:00
Al Zohali
7b7cf281d3
gammu-smsd service: init
2016-02-15 00:26:41 +03:00
Nikolay Amiantov
a0afc49f0f
dspam service: restrict socket access
2016-02-14 10:35:06 +03:00
Nikolay Amiantov
2cee5a42b0
dspam service: set ClientHost
2016-02-14 10:35:04 +03:00
Franz Pletz
6a036d9fca
Merge pull request #9913 from chris-martin/synaptics-options
...
Add synaptics options for palm detection and scroll speed
2016-02-14 06:08:36 +01:00
Markus Wotringer
4bc9e8a785
elasticsearch2: init at 2.2.0
...
changes by @globin:
* updated 2.1.0 to 2.2.0
* moved to a new derivation
closes #11446
Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-13 15:03:09 +00:00
Robin Gloster
c2b578386e
kibana: fix pkg and module
2016-02-13 15:03:09 +00:00
Robin Gloster
e1493f2ba7
logstash module: use literalExample
2016-02-13 15:03:09 +00:00
Edward Tjörnhammar
9c249a3adf
nixos: i2pd, make config options adhere to version 2.4.0
2016-02-13 15:22:31 +01:00
Nikolay Amiantov
c9d38164b7
dspam service: make maintenance script verbose
2016-02-12 18:00:00 +03:00
Eelco Dolstra
928035378d
Fix typo
2016-02-12 14:35:40 +01:00
Robin Gloster
648e596c5f
Merge pull request #12683 from heydojo/bluetooth--plasma5
...
kde5 bluedevil plasmoid : enable bluez5 bluetooth functionality
2016-02-12 13:49:54 +01:00
Eelco Dolstra
fd8bd17c3e
postgresql: Bump default version to 9.5
2016-02-12 13:20:11 +01:00
Peter Simons
a1fa485378
Revert "Remove double-backslashes from grub conf file".
...
This reverts commit b861bf8ddf
, because according to @mdorman [1] this
change rendered his NixOS systems unbootable, and we probably don't want that.
[1] b861bf8ddf (commitcomment-16058598)
2016-02-12 13:14:34 +01:00
Jinjing Wang
73b9a9662d
pdnsd service: init
2016-02-12 19:53:41 +08:00
Peter Simons
7bd6fc90cb
Merge pull request #12725 from jerith666/postfix-dns-bl
...
postfix service: implement DNS blacklist support
2016-02-12 12:43:27 +01:00
Franz Pletz
c29205f965
Merge pull request #12941 from elitak/unifi_fix
...
unifi: LD_LIBRARY_PATH hack for embedded libsnappyjava.so, fixes #12897
2016-02-12 08:22:20 +01:00
Edward Tjörnhammar
faf01ab0f7
Merge pull request #12038 from womfoo/facetimehd
...
facetimehd: PCIe webcam support for Macbooks
2016-02-12 07:32:42 +01:00
Edward Tjörnhammar
81b5223c97
nixos: gitit, wrong type restriction redacted
2016-02-12 07:00:37 +01:00
Matt McHenry
40c7d554d4
postfix service: implement DNS blacklist support
2016-02-11 22:13:09 -05:00
Ben Booth
b861bf8ddf
Remove double-backslashes from grub conf file
...
The double-backspashes in the splashimage, kernel, and initrd sections serve no purpose and confuse pygrub
2016-02-11 12:05:15 -08:00
Eric Litak
fc8a16f4ed
unifi: LD_LIBRARY_PATH hack for embedded libsnappyjava.so, fixes #12897
2016-02-11 09:06:33 -08:00
Nikolay Amiantov
ccece1ca88
dspam service: restart on failure
2016-02-11 14:03:34 +03:00
Eelco Dolstra
86c2a0f783
mediawiki: 1.23.9 -> 1.23.13
2016-02-11 11:24:44 +01:00