1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 08:31:59 +00:00
Commit graph

6835 commits

Author SHA1 Message Date
Guillaume Maudoux 698f178d4e default nixos config: add firewall options.
By showing how to open ports in the firewall and how to disable it, we make users aware that there is a firewall enabled by default.
2017-02-03 16:45:11 +01:00
Vladimír Čunát 2ba076e99c
Merge branch 'master' into staging
>11k more build jobs on master, just for Linux :-/
This way staging will never catch up.
2017-02-03 15:32:08 +01:00
Nikolay Amiantov 9eb540b807 qemu-vm module: fix boot.tmpOnTmpfs
This option caused systemd to mount /tmp on top of /tmp/{xchg,shared}.

Fixes #21490.
2017-02-03 15:02:34 +03:00
Vladimír Čunát adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Benjamin Staffin 53e6431d61 Merge pull request #22358 from yorickvP/asteriskupd
asterisk: add lts version
2017-02-03 02:30:34 -05:00
Nikolay Amiantov 5247140e57 Merge pull request #21875 from abbradar/gateway-interface
Allow specifying interface for default gateway
2017-02-03 02:26:31 +03:00
Pascal Bach ff3f3399ae filesystems: add support to mount glusterfs 2017-02-02 23:16:52 +01:00
Pascal Bach 19759cfeab services: add GlusterFS service
This service is only limited in configuration options.
But it is sufficient to run glusterd and configure it using the gluster command
2017-02-02 23:16:52 +01:00
Daiderd Jordan f87fb85259 Merge pull request #22376 from LumiGuide/wordpress-4.7.2
wordpress: 4.7.1 -> 4.7.2 (Security fix)
2017-02-02 19:30:36 +01:00
Daniel Peebles ff8a21e03c Merge pull request #22348 from nand0p/hologram-module
hologram: 8d86e3f -> d20d1c3
2017-02-02 17:42:07 +01:00
Fernando J Pando 1d85e0bbab hologram: 8d86e3f -> d20d1c3
- Updates dependencies
- Adds configuration module
- Tested on Nixos Unstable
2017-02-02 11:31:42 -05:00
Bas van Dijk 5cc75352f8 wordpress: 4.7.1 -> 4.7.2
See: https://make.wordpress.org/core/2017/02/01/disclosure-of-additional-security-fix-in-wordpress-4-7-2/
2017-02-02 16:41:32 +01:00
Yorick van Pelt 1b47bc9477 service.asterisk: add package option 2017-02-02 15:16:00 +01:00
Nikolay Amiantov 4feb0a998a manual: mention needed options for IPv6 2017-02-02 01:53:00 +03:00
Nikolay Amiantov 0cb487ee04 network-interfaces service: add defaultGateway{,6}.interface 2017-02-02 01:53:00 +03:00
Nikolay Amiantov 4abcef2ba1 bluez service: use upstream units 2017-02-02 00:52:54 +03:00
Nikolay Amiantov 8ef14f80e3 systemd service: add aliases option 2017-02-02 00:52:54 +03:00
Tristan Helmich 24f3abdafb
Revert "Make services.xserver.xkbDir conflict free when overriden."
This reverts commit 82bcfef109.

cc @nbp

Fixes #22290, #22352.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
2017-02-01 22:37:04 +01:00
Nikolay Amiantov c34cfa21d4 Merge pull request #22343 from abbradar/dbus-etc
dbus service: use /etc/dbus-1 for configuration
2017-02-01 23:00:07 +03:00
Nikolay Amiantov e0e9fddf56 nfsd service: use upstream systemd units
* Use /etc/nfs.conf as the recommended upstream way to configure services.
* Move server options to nfsd module.
2017-02-01 19:47:33 +03:00
Eelco Dolstra 9d6a55aefd
~/.nixpkgs -> ~/.config/nixpkgs
The former is still respected as a fallback for config.nix for
backwards compatibility (but not for overlays because they're a new
feature).
2017-02-01 16:07:55 +01:00
Vladimír Čunát a2e7770b51
Merge branch 'master' into staging
There have been some larger security rebuilds on master.
2017-02-01 15:56:35 +01:00
Nikolay Amiantov 72b3746266 dbus service: remove {system,session}.conf from config dir
They are already included by dbus from /run/current-system/sw/share/dbus-1.
2017-02-01 15:37:24 +03:00
Nikolay Amiantov 39344a36d3 dbus service: use /etc/dbus-1 for configuration
Also use upstream systemd units.
2017-02-01 15:03:22 +03:00
Franz Pletz f96c3f1844 Merge pull request #22180 from mguentner/offline_ipfs
services: ipfs: separate system units, add offline mode
2017-02-01 03:41:31 +01:00
Nikolay Amiantov 876a6d7f03 rpcbind service: use upstream systemd unit 2017-02-01 02:45:19 +03:00
Peter Simons 10349e72b9 nixos: drop unused 'haskellPackages' option from ihaskell service
Closes https://github.com/NixOS/nixpkgs/issues/19039.
2017-01-31 22:38:01 +01:00
Damien Cassou 58dc8e3024
Remove myself from maintainers 2017-01-31 11:00:14 +01:00
Vladimír Čunát 01751a9447
Merge #22309: vim: allow building with gtk3 2017-01-31 09:41:24 +01:00
Aneesh Agrawal 68b4a1f669 nixos: Respect nixpkgs.overlays (#22221) 2017-01-31 09:38:02 +01:00
Benjamin Staffin e01c15d433 nixos: if gnome3 is installed, build gvim for gtk3 too 2017-01-31 02:36:35 -05:00
Nikolay Amiantov 8d379ddfef opengl service: use option for XDG_DATA_DIRS 2017-01-31 04:38:09 +03:00
Nikolay Amiantov 98b0195dde video services: don't install OpenCL files to /etc
They shouldn't be needed now that we search them in /run/opengl-driver.
2017-01-31 03:36:25 +03:00
Edward Tjörnhammar b08524bf01
nixos: nylon, use named instances 2017-01-30 20:32:06 +01:00
Parnell Springmeyer 128bdac94f
Conditionally logging debug messages based on the WRAPPER_DEBUG env var being set (or not) 2017-01-30 12:59:29 -06:00
Parnell Springmeyer d8ecd5eb0d
Switching to individually generated derivations 2017-01-30 12:26:56 -06:00
Vladimír Čunát 9cd2dbc569
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Vaibhav Sagar 63f609b1a4 ihaskell: remove service configuration. (#22268)
See #22047. This change should be reverted after IHaskell has been
updated to support GHC 8.
2017-01-30 08:38:42 +01:00
Parnell Springmeyer 264db4e309
Set merge + mkIf always surprises me 2017-01-29 17:10:32 -06:00
Parnell Springmeyer f2f3f1479e
Derp, wrong path name 2017-01-29 16:54:27 -06:00
Parnell Springmeyer 0f728de67e
More migration cleanup + todos for cleanup 2017-01-29 16:52:23 -06:00
Parnell Springmeyer 4856b42ab6
Gotta provide sane defaults! This is what I get for 5AM coding 2017-01-29 16:47:14 -06:00
Parnell Springmeyer 9abe7528e4
Switching locate over to new wrapper API 2017-01-29 11:27:08 -06:00
Edward Tjörnhammar e324c02aa5
nixos: i2pd, follow redirect 2017-01-29 18:00:58 +01:00
Parnell Springmeyer 6777e6f812
Merging with upstream 2017-01-29 05:54:01 -06:00
Parnell Springmeyer c5f1f9a3b5
More mistake fixes 2017-01-29 05:45:43 -06:00
Parnell Springmeyer 9f82c9903d
More fixes 2017-01-29 05:44:29 -06:00
Parnell Springmeyer cfe4351c33
I'm clearly very tired 2017-01-29 05:39:54 -06:00
Parnell Springmeyer 3215bcf445
Beebooboop 2017-01-29 05:39:18 -06:00
Parnell Springmeyer a3e9d77640
More derp? It's 5am... 2017-01-29 05:36:47 -06:00
Parnell Springmeyer 1cc500ea8e
Syntax wibble 2017-01-29 05:34:50 -06:00
Parnell Springmeyer 628e6a83d0
More derp 2017-01-29 05:33:56 -06:00
Nicolas B. Pierron 82bcfef109 Make services.xserver.xkbDir conflict free when overriden. 2017-01-29 12:24:31 +01:00
Parnell Springmeyer 70b8167d4a
A few more tweaks 2017-01-29 05:05:30 -06:00
Parnell Springmeyer 4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer a8cb2afa98
Fixing a bunch of issues 2017-01-29 01:58:12 -06:00
Parnell Springmeyer af3b9a3d46
More wibbles? 2017-01-29 01:41:39 -06:00
Parnell Springmeyer 48564d1ae5
Another wibble 2017-01-29 01:31:33 -06:00
Parnell Springmeyer 5077699605
Derp derp 2017-01-29 01:27:11 -06:00
Parnell Springmeyer 0707a3eaa2
Qualify with lib 2017-01-29 01:23:10 -06:00
Parnell Springmeyer 8e159b9d1e
Qualify mkOption with lib 2017-01-29 01:22:47 -06:00
Parnell Springmeyer 70ec24093c
Removing dead code 2017-01-29 01:22:19 -06:00
Parnell Springmeyer 82de4c0fad
setcap-wrapper: Syntax wibble 2017-01-29 01:20:02 -06:00
Parnell Springmeyer 7680a40a37
setcap-wrapper: Syntax wibble 2017-01-29 01:16:04 -06:00
Parnell Springmeyer 2f113ee90a
setcap-wrapper: Minor refactor 2017-01-29 01:08:36 -06:00
Parnell Springmeyer 3fe7b1a4c9
setcap-wrapper: Addressing more PR feedback, unifying drvs, and cleaning up a bit 2017-01-29 01:07:12 -06:00
Parnell Springmeyer e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Tuomas Tynkkynen 424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
Joachim F ac1e65c302 Merge pull request #22230 from michaelpj/services/arbtt-fix-wanted-by
arbtt: multi-user.target does not exist in user systemd
2017-01-29 00:37:17 +01:00
Michael Peyton Jones 46c0da1818 arbtt: multi-user.target does not exist in user systemd 2017-01-28 14:29:19 +00:00
Joachim Fasting 6303d2b0ca
nixos: add sysstat to module list
The service itself was added in d3d7f43f76
2017-01-28 12:27:34 +01:00
Franz Pletz ae3fc70ede Merge pull request #22124 from mayflower/feature/frab
frab: init at 2016-12-28 & module
2017-01-27 17:15:05 +01:00
Dan Peebles ced27b2966 fluentd module: add configurable package option 2017-01-27 15:08:23 +00:00
Robin Gloster 8a104aa085
nixos/release-small.nix: cleanup to use default versions
It makes more sense to test the packages, that probably more people are
using.
2017-01-27 15:33:54 +01:00
Robin Gloster 8769ddc823
apacheHttpd_2_2: remove 2017-01-27 15:33:54 +01:00
Guillaume Maudoux 29667f639c dbus: catch new services without reboot (#20871)
DBus daemon now loads its config from /run/current-system/dbus.
Reloading the daemon makes it re-read that file and catch the updates
after a system upgrade.
2017-01-27 14:46:13 +01:00
Frederik Rietdijk 46b1ea260a pythonPackages.ansible2: move 2.2 to separate file, make default
`pythonPackages.ansible_2_2` is now the default `ansible`.
2017-01-27 10:15:31 +01:00
Tuomas Tynkkynen be0e48e48f Merge remote-tracking branch 'upstream/master' into staging 2017-01-27 02:18:44 +02:00
Maximilian Güntner 123dd9f4e7
services: ipfs: separate system units, add offline mode
Offline mode: When adding a lot of data, start this service.
It will will not flood the DHT since it only exposes the API.
When you are done simply reverse the process.
2017-01-27 00:27:50 +01:00
Mike Cooper 18eff26dd9
Fix typo in pulseaudio.nix 2017-01-26 20:52:33 +01:00
Parnell Springmeyer 9de070e620
Setuid wrapper should not be constrained to a specific linux kernel version 2017-01-26 09:39:37 -08:00
Parnell Springmeyer 01e6b82f3f
Removing dead code 2017-01-26 09:20:15 -08:00
Robin Gloster a38f1911d3
systemd: 231 -> 232
Includes adding some more upstream units and removing obsolete (-.slice) ones.
2017-01-26 17:52:52 +01:00
Tuomas Tynkkynen e2a2f6d595 Merge pull request #22117 from dezgeg/aarch64-for-merge
Aarch64 (ARM64) support
2017-01-26 17:52:28 +02:00
Gregor Kleen 06211e700b locate: build in correct dbpath 2017-01-26 12:57:03 +01:00
Gregor Kleen cc1ebd1db4 locate: enhance mlocate support 2017-01-26 12:57:02 +01:00
Gregor Kleen 114e738e41 locate: better mlocate support & cleanup 2017-01-26 12:56:53 +01:00
Parnell Springmeyer 189a0c2579
Wrap with quotes as-per GCC's recommendation 2017-01-26 02:07:36 -08:00
Parnell Springmeyer c30cf645f8
Make setting of the wrapper macros a compile-time error 2017-01-26 02:06:24 -08:00
Parnell Springmeyer a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Parnell Springmeyer ad8fde5e5d
Andddd more derp 2017-01-26 01:33:25 -08:00
Parnell Springmeyer ce36b58e21
Derp 2017-01-26 01:31:49 -08:00
Parnell Springmeyer f64b06a3e0
Hmmm 2017-01-26 01:13:19 -08:00
Parnell Springmeyer fd974085bf
It's clearly quite late 2017-01-26 01:04:12 -08:00
Parnell Springmeyer 61fe8de40c
Silly, should just have one activation script 2017-01-26 01:03:18 -08:00
Parnell Springmeyer 48a0c5a3a7
More fixing 2017-01-26 01:00:46 -08:00
Parnell Springmeyer 21368c4c67
Hmm, unnecessary 2017-01-26 00:58:44 -08:00
Parnell Springmeyer a4f905afc2
Enhhh I think compile time macros are gross 2017-01-26 00:41:00 -08:00
Parnell Springmeyer 785684f6c2
Ahhh, my compile-time macros confused me...of course they did... 2017-01-26 00:39:17 -08:00
Parnell Springmeyer 1ad541171e
Hmm 2017-01-26 00:36:35 -08:00
Parnell Springmeyer e8bec4c75f
Implicit declared function... 2017-01-26 00:35:01 -08:00
Parnell Springmeyer a20e65724b
Fixing 2017-01-26 00:32:59 -08:00
Parnell Springmeyer 025555d7f1
More fixes and improvements 2017-01-26 00:05:40 -08:00
Robin Gloster 5de731c853
tests.bittorrent: use a file instead of a directory
nixUnstable.src is a directory, which made cp fail without -r
2017-01-26 02:44:05 +01:00
Franz Pletz fbf762e0b7
frab module: init 2017-01-25 23:58:21 +01:00
Robin Gloster 117e5547d1 Merge pull request #21311 from makefu/services/logstash
services.logstash: default options, examples and address update
2017-01-25 22:11:40 +01:00
aszlig d01b9493c9
nixos/doc/installing: Fix typo in <literal/>
The tag wasn't properly closed which caused the manual build to fail.

Tested with: nix-build nixos/release.nix -A manual.x86_64-linux

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-01-25 21:40:07 +01:00
Shaun Sharples 462ef74442 factorio: remove autosave-interval from command-line options 2017-01-25 21:39:37 +01:00
Shaun Sharples 7f358917ee factorio: settings moved from command-line options to server-settings.json 2017-01-25 21:39:37 +01:00
Pascal Bach a6968ad43c installing: document how to activate SSH during installation 2017-01-25 21:09:31 +01:00
Pascal Bach 01fd86723c install-device: correct command to start sshd 2017-01-25 21:09:31 +01:00
Pascal Bach 03ef04f0a4 install-device: permit root login with password
Allow password login to the installation this allows doing remote installation
via SSH. All that need to be done on the local machine is:
1. Boot from the installation media
2. Set a password with passwd
3. Enable SSH with systemctl start sshd

It is safe as root doesn't have a password by default
and SSH is disabled by default.

Fixes #20718
2017-01-25 21:09:31 +01:00
Parnell Springmeyer bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
Franz Pletz 516760a6fb
nixos/acme: add random delay to timer
This way we behave like good citizens and won't overload Let's Encrypt
with lots of cert renewal requests at the same time.
2017-01-25 19:15:04 +01:00
Vladimír Čunát 278bbe3b33
add kresd service with basic options
Still celebrating today's 1.2.0 release!
2017-01-25 18:46:28 +01:00
Robin Gloster b79fa22b7a
tests.installer: rely on swap.target in tests
fixes #5258
2017-01-25 17:00:13 +01:00
Bob van der Linden d9987f360a nginx: added serverName option for virtualHosts
This allows overriding the `server_name` attribute of virtual
hosts. By doing so it is possible to have multiple virtualHost
definitions that share the same `server_name`. This is useful in
particular when you need a HTTP as well as a HTTPS virtualhost: same
server_name, different port.
2017-01-25 14:55:55 +01:00
Franz Pletz b9b95aa4d4 Merge pull request #22034 from mayflower/conntrack-helpers
Disable conntrack helper autoloading by default
2017-01-25 14:18:41 +01:00
Tuomas Tynkkynen 32643dc07d installer: sd-image-*.nix: Document how to build them 2017-01-25 15:07:37 +02:00
Daniel Peebles 95add2c2f7 Merge pull request #22103 from copumpkin/automatic-kafka-broker-id
apache-kafka service: change default brokerId to -1
2017-01-24 22:17:03 -05:00
Tuomas Tynkkynen 0e4c1bfb43 installer: Add SD image expression for Aarch64
This one works on the Raspberry Pi 3 so far.
2017-01-25 02:14:47 +02:00
Tuomas Tynkkynen b29ee6c8ff U-Boot: Add 64-bit Raspberry Pi 3 build
And rename the old ubootRaspberryPi3 to ubootRaspberryPi3_32bit.
2017-01-25 02:14:47 +02:00
Franz Pletz 8d5a4c53b8
nixos/release-notes: document conntrack helper changes 2017-01-25 01:14:05 +01:00
Franz Pletz 2d9152d509
nixos/tests/nat: add test for conntrack helper autoloading 2017-01-25 01:14:05 +01:00
Franz Pletz 8322a12ef2
firewall: disable conntrack helper autoloading by default
This was disabled in the Linux kernel since 4.7 and poses a security risk
if not configured properly.

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=486dcf43da7815baa615822f3e46883ccca5400f
2017-01-25 01:14:04 +01:00
Franz Pletz 403fdd737e
linux: remove canDisableNetfilterConntrackHelpers feature
This feature is available in all kernels in nixpkgs.
2017-01-25 00:28:55 +01:00
John Ericson 5ad696b067 Merge pull request #22107 from Ericson2314/cross-tepid
Somewhat saner cross-compiling through bootstrapping
2017-01-24 15:09:56 -05:00
Thomas Tuegel 54df142672
nixos/kde5: use kimpanel with IBus by default 2017-01-24 12:55:06 -06:00
Thomas Tuegel e38970c60b
nixos/ibus: fix custom panel example
The example was missing a `''`, so it did not appear correctly in the
manual. This also caused the manual to retain references inappropriately.
2017-01-24 12:52:39 -06:00
Michael Raskin ae4f2fd145 Merge pull request #22066 from mbrgm/journalbeat
journalbeat service: init at 5.1.2
2017-01-24 17:56:48 +00:00
Michael Raskin 7516dbe35e Merge pull request #22045 from rnhmjoj/recursor
PowerDNS Recursor: add package and service
2017-01-24 17:54:47 +00:00
Michael Raskin 47661c831e Merge pull request #22028 from MostAwesomeDude/tahoe
Tahoe-LAFS version bump
2017-01-24 17:49:00 +00:00
Dan Peebles eebee95176 apache-kafka service: change default brokerId to -1
A default of 0 means that if you deploy two NixOS boxes with the default
configuration, the second will fail because the brokerId was already in
use. Using -1 instead tells it to pick one automatically at first start.
2017-01-24 12:32:22 -05:00
John Ericson 7dc4e43837 nixos doc: Mention cross overhaul in 17.03 release notes 2017-01-24 11:37:56 -05:00
Kai 25d86bdd10 vnstat service: init (#19809) 2017-01-24 14:45:01 +01:00
Tristan Helmich b3b300b6ff smokeping: setuid for fping6 2017-01-24 12:40:21 +01:00
Vladimír Čunát fd26ad6f76
nixos programs.man.enable: improve description 2017-01-24 09:59:54 +01:00
Corbin de4c9e0d15 nixos/services/tahoe: Work around awkward command. 2017-01-23 17:55:41 -08:00
Tuomas Tynkkynen b63f97c6e6 installer: Include stdenvNoCC
And don't include ArchiveCpio as that one is no longer needed after
5a8147479 ("make-initrd: create reproducible initrds").
2017-01-23 23:49:18 +02:00
Marius Bergmann 00444cbf25 journalbeat service: init at 5.1.2
Journalbeat is a log shipper from systemd/journald to
Logstash/Elasticsearch. I added a package as well as a NixOS service
module for it.
2017-01-23 18:28:55 +01:00
rnhmjoj 6bcf89f217
pdns-recursor: add service 2017-01-23 17:57:48 +01:00
Jaka Hudoklin 90e0ed32ef Merge pull request #22043 from rnhmjoj/dnscrypt-wrapper
dnscrypt-wrapper: add service
2017-01-23 11:23:28 +01:00
rnhmjoj 9f2bb2ed42
dnscrypt-wrapper: add service 2017-01-23 07:06:07 +01:00
Robert Helgesson cd9f709582
flannel service: fix enable expression
Need to surround the equality check in parentheses.
2017-01-22 21:58:39 +01:00
Franz Pletz df0301f59b
nixos/networkmanager: trigger assertion instead of error 2017-01-22 20:32:24 +01:00
Charles Strahan d298a961f1 Merge pull request #21416 from cstrahan/mesos-1.1.0
mesos: 1.0.1 -> 1.1.0
2017-01-21 19:05:18 -05:00
Charles Strahan 5b1b089de3 Merge pull request #8642 from cstrahan/slim-console-cmd
nixos: provide default console_cmd for slim
2017-01-21 19:01:02 -05:00
Charles Strahan 71f92bc8a3
nixos: provide default console_cmd for slim
This provides a default console_cmd for the slim display-manager.

When the user enters "console" as the user name, slim will run this
command.

Having a default is rather important; the virtual terminals don't work
with some display drivers, so having a broken X session can leave you
locked out of your machine.
2017-01-21 18:59:28 -05:00
Franz Pletz ab90eac835
networking: fix typo in resolvconf option edns0 2017-01-21 20:41:11 +01:00
Daiderd Jordan 1aa77d0519 Merge pull request #19363 from schneefux/gogs-module
gogs: init module
2017-01-21 16:25:16 +01:00