1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Commit graph

8671 commits

Author SHA1 Message Date
Andreas Rammhold bc069622dd
Merge pull request #41367 from andir/nixos-mpd-dbFile-null
nixos/mpd: allow services.mpd.dbFile to be null
2018-06-01 19:39:17 +02:00
Andreas Rammhold a0797bad2c
nixos/mpd: allow services.mpd.dbFile to be null
This change allows users to specify an alternative database method. For
example an mpd satellite setup where another mpd on the network shares
it's database with the local instance. The `dbFile` parameter must not be
configured in that case.
2018-06-01 19:17:15 +02:00
Tuomas Tynkkynen e864247f08 Merge branch 'plat-fix-for-merge-2' into master 2018-06-01 20:08:08 +03:00
Tuomas Tynkkynen f49906d80c nixos/sd-image-raspberrypi: Support Raspberry Pi Zero 2018-06-01 13:48:55 +03:00
coretemp 2d3db84ddb dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039) 2018-05-31 23:15:19 +02:00
Matthew Bauer 05eb57b35d Revert "nixpkgs module: Fix defaulting of localSystem and system"
This reverts commit 4fe2898608.

This gives a recursion in certain nixpkgs configs.
2018-05-31 15:55:36 -04:00
Matthew Bauer 2f68e86ce6 zsh: only do promptInit when TERM!=dumb
This allows tramp to be used correctly when default shell is zsh.
2018-05-31 12:34:16 -04:00
Matthew Justin Bauer e754f60fd9
Merge pull request #40708 from obsidiansystems/nixos-nixpkgs-defaults
nixpkgs module: Fix defaulting of `localSystem` and `system`
2018-05-31 11:03:04 -04:00
Joachim F 83e3480686
Merge pull request #41218 from Gerschtli/fix/gitea-pre-start
nixos/gitea: fix pre start script
2018-05-31 13:43:27 +00:00
Eelco Dolstra 47b85dc5ab
nix: 2.0.3 -> 2.0.4 2018-05-31 11:31:04 +02:00
Rob Vermaas a8ed1fc4ed Update GCE image for 18.03
(cherry picked from commit 8aa385069f)
2018-05-30 19:36:39 +02:00
Eelco Dolstra 0eea0209cf
nix: 2.0.2 -> 2.0.3 2018-05-30 11:47:09 +02:00
Peter Hoeg 159c1576c8
Merge pull request #40579 from peterhoeg/m/sddm
sddm: add support for hidpi mode
2018-05-30 16:23:07 +08:00
aszlig 94bc38e6c1
nixos/bind: Allow to set extra options
BIND doesn't allow the options section (or any section I'd guess) to be
defined more than once, so whenever you want to set an additional option
you're stuck using weird hacks like this:

services.bind.forwarders = lib.mkForce [ "}; empty-zones-enable no; #" ];

This basically exploits the fact that values coming from the module
options aren't escaped and thus works in a similar vain to how SQL
injection works.

Another option would be to just set configFile to a file that includes
all the options, including zones. That obviously makes the configuration
way less extensible and more awkward to use with the module system.

To make sure this change does work correctly I added a small test just
for that. The test could use some improvements, but better to have a
test rather than none at all. For a future improvement the test could be
merged with the NSD test, because both use the same zone file format.

This change has been reviewed in #40053 and after not getting any
opposition, I'm hereby adding this to master.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @peti, @edolstra
Closes: #40053
2018-05-30 05:07:39 +02:00
Daiderd Jordan c4e9ebc248
Merge pull request #38791 from LnL7/nixos-profile-variables
nixos: remove PKG_CONFIG_PATH/PERL5LIB environment variables
2018-05-30 00:23:34 +02:00
Tobias Happ 28c20a4731 nixos/gitea: fix pre start script
The hooks directory contains now one level deep subdirectories which
need to be updated as well.
If you use gitea via ssh, ~/.ssh/authorized_keys also needs to be
updated because of the hardcoded path to gitea in the "command" option.
2018-05-29 19:53:12 +02:00
Nathaniel McCallum 29f75982a6 nixos.modules.tasks.swraid: add raid10 module to initrd 2018-05-28 23:49:35 +03:00
Geoffrey Huntley f607f01b70 fix: connect the --bind-address arg to the cfg.apiserver.address option 2018-05-28 18:07:06 +02:00
Jörg Thalheim 06fe322187
Merge pull request #39482 from Chiiruno/init/meguca
meguca: init at 2018-05-17
2018-05-27 23:06:53 +01:00
Tuomas Tynkkynen 2760b24462 Merge remote-tracking branch 'upstream/master' into staging 2018-05-26 19:01:18 +03:00
Okina Matara e2f1a05756 meguca: git-2018-05-17 -> git-2018-05-20 2018-05-26 07:03:49 -05:00
Okina Matara 14a26f0153 meguca: init at git-2018-05-17 2018-05-26 07:03:49 -05:00
Sarah Brofeldt 2052c1687e
Merge pull request #41073 from johanot/kube-1.10
kubernetes: 1.9.7 -> 1.10.3
2018-05-26 11:35:37 +02:00
Peter Hoeg 30c3487e04 ids: assing openvpn 2018-05-26 11:11:48 +08:00
Jan Malakhovski ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
Alberto Berti 29fd05f3f5 Kuberetes Dashboard addon 1.8.2 -> 1.8.3
As shipped with k8s 1.10.3.

Also:
- updated the definition jsons as they are distributed in k8s.
- updated the image uris as they are renamed in k8s
- added imageDigest param as per 736848723e
2018-05-25 11:10:02 +02:00
Alberto Berti 55fa98dd76 Kuberbetes DNS addon 1.14.4 -> 1.14.10
As shipped with k8s 1.10.3.

Also:
- updated the definition jsons as they are distributed in k8s.
- updated the image uris as they are renamed in k8s
- added imageDigest param as per 736848723e
2018-05-25 10:59:10 +02:00
Charles Strahan 996849ab86 kubernetes: update to 1.10 2018-05-25 10:50:36 +02:00
Tuomas Tynkkynen 696c6bed4e w3m: Add a variant without graphics support and use for NixOS manual
This gets rid of various graphics libraries from the minimal installer.
2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen 91117f0d1d nixos/installer: Drop dmraid
This seems some obsolete software RAID configuration program that hasn't
been updated since 2010.
2018-05-25 01:55:51 +03:00
Daniel Frank c42cb40291 nixos/systemd-timesyncd: use the correct server list (#40919) 2018-05-24 22:44:04 +00:00
Uli Baum 7ba417aeca nixos/slurm: fix xml tag mismatch in manual
build of nixos manual broke because of mismatched xml tags
in an option description introduced in #41016.
2018-05-24 22:56:57 +02:00
lewo 4ccb13adb6
Merge pull request #40665 from seppeljordan/fix-kubernetes-modules
nixos/kubernetes: Update kube-dns and kube-dashbashboard docker image…
2018-05-24 20:31:35 +02:00
xeji 8d4716ac90
Merge pull request #41016 from markuskowa/slurm-pr
nixos/slurm: fix default module parameters, update documenation
2018-05-24 17:23:03 +02:00
Markus Kowalewski fb7428c506
nixos/slurm: enable munge by default, added note to slurm description 2018-05-24 16:59:48 +02:00
Peter Hoeg 5b468ea6b1 nixos mysql: make start-up more robust (#41010)
1) Change start-type to ```notify``` when running MariaDB so that we don't have to busy-wait for the
socket to appear.

2) Do not manually create the directory under /run as we can get systemd to do
that for us. This opens up the possibility later for not having to launch as root.
2018-05-24 16:42:16 +02:00
Geoffrey Huntley e22d072c64 kubernetes: fix 404 links to documentation 2018-05-24 14:16:08 +02:00
Robert Schütz 3c0daa19e2 nixos/borgbackup: make extraArgs a shell variable
in line with the other extra*Args variables
2018-05-24 13:53:25 +02:00
Jörg Thalheim d45e3e36f8
Merge pull request #41015 from tazjin/feat/datadog-gohai
Add missing gohai derivation and fix dd-agent service unit
2018-05-24 10:24:38 +01:00
Markus Kowalewski 2a14e898bc
slurm/module: add ProcTrackType option to unbreak default setup 2018-05-24 11:11:37 +02:00
Vincent Ambo f4c87183df nixos/dd-agent: fix runtime errors by adding gohai to $PATH
The Datadog agent requires `gohai` to be available on its `$PATH` in
order to collect certain metrics.

It would previously start up and collect certain types of metrics, but
log errors related to the missing gohai binary.

This commit configures the systemd-unit to make gohai available at
runtime.

This fixes #39810.
2018-05-24 10:58:28 +02:00
Sarah Brofeldt e27a4502cb
Merge pull request #40879 from seppeljordan/pr-ipfs-port-scanning
nixos/ipfs: Add option to disable local port scanning for ipfs daemon
2018-05-24 10:53:49 +02:00
Simon Lackerbauer 120e93928f
crowd: 3.0.1 -> 3.1.2 2018-05-24 04:40:47 +02:00
WilliButz de5205ae2d
nixos/prometheus-node-exporter: fix file collector 2018-05-24 04:40:46 +02:00
Robin Gloster 53475653a5
gitlab module: update for 10.8 2018-05-24 04:40:46 +02:00
Simon Lackerbauer 1433ec60af
nixos/borgbackup: let borg write to disk and see /tmp, add extraArgs 2018-05-24 04:40:45 +02:00
WilliButz e91d3c9179
nixos/oxidized: add module 2018-05-24 04:40:45 +02:00
Tuomas Tynkkynen 6f1f11af4c nixos/programs/shell.nix: Enhance bad ownership error message
Steal this from scripts/nix-profile.sh.in in Nix to keep things more
consistent.
2018-05-24 04:58:57 +03:00
Tuomas Tynkkynen 3cfb492c63 nixos/programs/shell.nix: Use [ ] instead of test
Half of the script is using 'test' and other half '[ ]'. Let's stick to
'[ ]' everywhere as it seems more conventional in nixpkgs.
2018-05-24 04:58:57 +03:00
Tuomas Tynkkynen 7adae10a86 nixos/programs/shell.nix: Quote variables
In practice $HOME doesn't contain spaces, but let's stick to best
shell scripting practices anyway.
2018-05-24 04:58:57 +03:00