BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
138534 commits 1 branch 0 tags 3.8 GiB
Commit graph

8429 commits

Author SHA1 Message Date
Nikolay Amiantov
d61e6c5ed7 opengl service: move options under common hardware.opengl tree 
Purely cosmetic.
 2018-03-26 14:01:49 +03:00
Nikolay Amiantov
0934c8f49b nvidia service: rely on libglvnd 2018-03-26 14:01:49 +03:00
Jaka Hudoklin
cb9c1c63c9 nixos/tor: expose control socket 2018-03-26 00:41:10 +00:00
Will Dietz
cb30a1b425 wrapper.c: fixup includes to work w/musl 2018-03-25 18:06:02 -05:00
Guillaume Maudoux
c948613a65 almir: also remove the corresponding module. 
The almir package was removed in 30291227f2 at about 2017-08
This module can no more be used without it.
 2018-03-25 21:41:19 +01:00
Frank Doepper
66deb3aa29 quagga service: fix service and re-enable test 
adding quagga to quaggavty
reverting 8a18e1f
 2018-03-25 21:26:45 +02:00
Michael Raskin
296dca019b
Merge pull request #35073 from Infinisil/fix/znapzend 
nixos/znapzend: fix when no previous zetup
 2018-03-25 17:29:08 +00:00
Matthew Justin Bauer
8f3091939b
Merge pull request #37752 from ryantm/fix-urls 
treewide: use more HTTPS URLs
 2018-03-25 00:40:17 -05:00
Ryan Mulligan
b189247ba0 treewide: use more HTTPS URLs 
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
 2018-03-24 22:04:25 -07:00
Wout Mertens
527e97f333
acme module: update for simp_le v0.8 
Hopefully fixes #37689
 2018-03-24 17:43:32 +01:00
Shea Levy
0f854cd2d1
Merge branch 'master' into staging 2018-03-24 01:34:53 -04:00
Florian Klink
6ac74d60ad networkmanager-pptp: remove package 
Currently broken on NixOS due to hardcoded modprobe binary path (see
bug #30756 from Oct 2017), no activity on a proposed fix for months.
As the protocol is terribly broken anyways, let's better remove it
completely, and not talk about anymore ;-)

Closes #30756.
 2018-03-23 22:24:50 +01:00
Nikolay Amiantov
91072b7b23
Merge pull request #37647 from abbradar/systemd-238 
[WIP] Update systemd and unbreak staging
 2018-03-23 01:11:32 +03:00
Nikolay Amiantov
0ccab4946d systemd: 237 -> 238 2018-03-22 22:37:26 +03:00
Matthew Justin Bauer
779c25b2fe
Merge pull request #34053 from thpham/serviio 
serviio: init at 1.9
 2018-03-22 11:11:17 -05:00
Robin Gloster
fda705527d
nixbot: remove 
obsoleted mostly by ofborg
 2018-03-22 16:17:12 +01:00
WilliButz
c54aa1f293
nixos/prometheus-exporters: add postfix exporter & documentation 2018-03-22 14:52:23 +01:00
WilliButz
f4d03b5c9c
nixos/prometheus-exporters: rewrite and restructure 
- prometheus exporters are now configured with
  `services.prometheus.exporters.<name>`
- the exporters are now defined by attribute sets
  from which the options for each exporter are generated
- most of the exporter definitions are used unchanged,
  except for some changes that should't have any impact
  on the functionality.
 2018-03-22 14:46:17 +01:00
Robin Gloster
76ea0e1b2e
Merge pull request #32960 from florianjacob/prosody-0.10 
Prosody 0.10.0
 2018-03-22 14:12:57 +01:00
volth
f68871764d treewide: replace depecated alias s/mssys/ms-sys/g 2018-03-22 10:13:21 +00:00
Robin Gloster
0a80f2c0f4
prosody: improve module handling 2018-03-22 03:40:46 +01:00
Franz Pletz
e5a854e740
gitlab service: use recommended unicorn config 2018-03-22 02:29:28 +01:00
Simon Lackerbauer
1b55905806
gitlab: 10.3.4 -> 10.5.4 2018-03-22 02:29:28 +01:00
Robin Gloster
31d77fd4f3
gitlab-shell: fix config path finding 
and remove TimeoutSec for gitlab
 2018-03-22 02:29:27 +01:00
Robin Gloster
fa347164b6
graylog: use jre_headless 2018-03-22 02:29:27 +01:00
Geoffrey Huntley
a88ec5e8a5 duosec: use root uid as sshd uid has been retired (#33597) 
* fix: use root uid as sshd uid has been retired

fixes https://github.com/NixOS/nixpkgs/issues/10088
related PR (abandoned) at https://github.com/NixOS/nixpkgs/pull/15391

* must use "sshd" user otherwise duosec does not work in multi user mode

see https://github.com/duosecurity/duo_unix/issues/89#issuecomment-272062632
 2018-03-21 18:46:35 -05:00
Dan Peebles
6fa9d9cdbd hologram-server module: add cache timeout option 
The version of hologram we're using has supported this option for a
while, but we didn't expose it through the NixOS module
 2018-03-21 12:58:25 -04:00
Thomas Karolski
e5073bcb80
Fix permission on working directory 
The working directory needs the x flag, otherwise executors (e.g. sparks executor) are unable to cd into their sandbox and create e.g. temporary files.
 2018-03-21 02:26:04 +01:00
Eelco Dolstra
7db841512a
Remove obsolete /nix/var/nix/{manifests,channel-cache} 2018-03-20 18:26:13 +01:00
Jörg Thalheim
35eddf5ef1
Merge pull request #37412 from volth/varnish456 
varnish4: init at 4.1.9; varnish6: init at 6.0.0
 2018-03-20 07:55:52 +00:00
Joel Thompson
fe2e4d6fb9 hologram: Enable configuring LDAP authorization 
In AdRoll/hologram#62 support was added to hologram to configure
LDAP-based authorization of which roles a user was allowed to get
credentials for. This adds the ability to configure that.

Additionally, AdRoll/hologram/#94 added support to customize the LDAP
group query, so this also feeds that configuration through.

fixes #37393
 2018-03-20 07:36:23 +00:00
volth
002b460822 varnish4: init at 4.1.9; varnish6: init at 6.0.0 2018-03-20 07:10:36 +00:00
Robert Schütz
c484079ac7
Merge pull request #36927 from dotlambda/borg-module 
nixos/borgbackup: init
 2018-03-19 20:30:32 +01:00
WilliButz
ca7b29050f grafana: 5.0.2 -> 5.0.3, fix headless phantomjs 2018-03-19 19:59:10 +01:00
Matthew Justin Bauer
ce01740dae
Merge pull request #33685 from corngood/amdgpu-pro-upgrade 
amdgpu-pro: 17.10 -> 17.40
 2018-03-19 12:40:03 -05:00
Robert Schütz
fdf0f037be nixos/borgbackup: init 2018-03-19 13:12:47 +01:00
Jörg Thalheim
86dd3f854b
Merge pull request #35687 from volth/libvirt-4.1.0 
libvirt: 3.10.0 -> 4.1.0
 2018-03-19 11:42:06 +00:00
Sarah Brofeldt
45241c5cd1
Merge pull request #37272 from erictapen/manual-networking 
nixos/manual: fixed example config for networking.interfaces
 2018-03-18 17:50:37 +01:00
Jörg Thalheim
705fee5150
Merge pull request #37198 from giraffito/patch-2 
nixos/sudo: fix description of sudo.wheelNeedsPassword
 2018-03-18 12:27:43 +00:00
Peter Hoeg
2859483fe9 nixos home-assistant: a couple of fixes (#36338) 
a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)
 2018-03-18 12:46:36 +01:00
Jörg Thalheim
5c1c4fbb06
Merge pull request #37084 from herrwiese/evilwm 
nixos/window-managers: actually add evilwm to default.nix
 2018-03-18 11:13:23 +00:00
Jörg Thalheim
ac9818fa70
Merge pull request #37216 from teto/qemu_comma_fix 
qemu-vm: passing QEMU_NET_OPTS would fail
 2018-03-18 10:17:50 +00:00
Elis Hirwing
fa76c9a385
gitea: fix usage over ssh 
Using gitea over ssh had two isses:
 1. No shell was set for the user
 2. Gitea tried to write logs to
 /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
 serving the ssh usage.
 2018-03-18 10:11:02 +01:00
Yurii Rashkovskii
738bcfdef8
config.hardware.onlykey configuration option 
By default, OnlyKey device (https://crp.to/p/) won't work on Linux (and,
therefore, NixOS). This is unintuitive and requires one to search for a
solution in the documentation.

This change allows one to enable OnlyKey device support directly from
their NixOS configuration.
 2018-03-18 12:49:13 +07:00
Corey O'Connor
28a55f5bd6 jenkins: Add "java.awt.headless=true" to JDK options. 
This is consistent with the recommended jenkins startup script. See:

* https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
 2018-03-17 22:16:59 -07:00
Corey O'Connor
241160aacc jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning. 2018-03-17 22:16:26 -07:00
Justin Humm
d69e0d99e0
nixos/manual: fixed example config for networking.interfaces 
The former example gave a "value is a list while a set was expected" error.
 2018-03-17 19:53:06 +01:00
Matthieu Coudron
33b0ad83e9 qemu-vm: passing QEMU_NET_OPTS would fail 
because of a change in #36850.
spotted by @jtojnar b7a2333ebe (commitcomment-28134992)
 2018-03-17 23:21:27 +09:00
giraffito
b9639d7e1f
nixos/security: fix description of sudo.wheelNeedsPassword 
the previous description mistakenly described the opposite semantics
 2018-03-16 21:50:46 +00:00
Vladimír Čunát
03cf538ef2
18.09: Jackrabbit -> Jellyfish 
See eb0fa09232 and github discussion on that.
My misgiving about the t-shirts was refuted.
I don't think this flip may negatively affect anyone.
 2018-03-16 12:26:03 +01:00
Tuomas Tynkkynen
ef64208eba Merge commit '3ab2949' from staging into master 
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
 2018-03-15 22:30:56 +02:00
Samuel Leathers
5931f463ad
Merge pull request #36924 from etu/gitea-postgres-autocreate-database 
Gitea postgres autocreate database
 2018-03-15 14:01:01 -04:00
Elis Hirwing
1ad75d0c50
gitea: enable and configure postgres service if selected as database 2018-03-15 18:34:54 +01:00
Andreas Wiese
c7e1dff94e nixos/window-managers: actually add evilwm to default.nix 
Commit 1f2b938 introduced a module for evilwm as a window-manager, but
did not actually add this module to window-manager's default.nix which
renders it useless.
 2018-03-15 10:22:53 +01:00
Jan Malakhovski
8bbd48e40f nixos: fix install-grub.pl dependencies 
fallback from updates to perl
 2018-03-15 04:51:12 +00:00
Tuomas Tynkkynen
9e78baf5c7 nixos/qemu-vm: Add virtualized display + HID devices on AArch64 2018-03-14 21:18:20 +02:00
Vladimír Čunát
eb0fa09232
18.09: let's call it "Jackrabbit" 
I was mainly considering Jellyfish and Jaguar (and Jackrabbit).
Originally I was inclined for Jellyfish, but then I thought of the
release T-shirts someone makes and it didn't seem suitable...
Jaguar would keep the name referring to a car as well, but as a
not-too-old (Mac) OS version is codenamed that way, I didn't go for it.
 2018-03-14 15:13:34 +01:00
lewo
65e5bc713b
Merge pull request #36845 from jbedo/singularity 
singularity: 2.4 -> 2.4.2
 2018-03-14 10:19:10 +01:00
Tuomas Tynkkynen
2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
 2018-03-13 23:04:18 +02:00
Michael Raskin
bfbc4951a6
Merge pull request #36850 from teto/virtualisation 
Virtualisation
 2018-03-13 13:40:33 +00:00
Florian Jacob
226965da67 prosody: 0.9.12 -> 0.10.0 
updating config options, removing luazlib as mod_compression was removed
for security reasons.
 2018-03-12 20:19:03 +01:00
Jörg Thalheim
9881934b57
Merge pull request #36783 from Infinisil/desciption/update/resilio 
resilio: Adjust option description to 3d17573
 2018-03-12 11:04:51 +00:00
Matthieu Coudron
c476d2f592 grub-install.pl: more details on blkid failure 2018-03-12 17:32:59 +09:00
Matthieu Coudron
7b7860ff89 build-vm: remove trailing dot from script path 
Allow to double click/middle click paste path a bit quicker.
 2018-03-12 17:31:24 +09:00
Matthieu Coudron
b7a2333ebe qemu-vm: removes warning when running build-vm 
get rid of deprecated qemu commands
 2018-03-12 17:29:55 +09:00
Justin Bedo
5c1e42276d
singularity: 2.4 -> 2.4.2 2018-03-12 15:13:31 +11:00
Silvan Mosberger
86ca617948
resilio: Adjust option description to 3d17573 2018-03-11 01:18:34 +01:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00:00
Silvan Mosberger
08704aa2f7
nixos/network-interfaces: Fix 2 small typos 2018-03-10 16:16:56 +01:00
Jörg Thalheim
558949f2c0
Merge pull request #36357 from matthewbauer/vbox-usable 
demo: make virtualbox more usable
 2018-03-09 11:36:13 +00:00
volth
632e9e62c8 libvirt: 3.10.0 -> 4.1.0 2018-03-08 23:45:28 +00:00
Daiderd Jordan
db6fb869fb
Merge pull request #30418 from LnL7/inline-set-environment 
nixos: inline set-environment for bash and zsh
 2018-03-08 21:07:15 +01:00
Jörg Thalheim
196e21a160 nixos/tomcat: add types + proper systemd integration 
fixes #35443
 2018-03-08 09:09:42 +00:00
Benjamin Smith
024220bd7f nixos/tomcat: add serverXml, environment files and log directories 
* add serverXml verbatim override
* add environment file
* add log directory creation
 2018-03-08 09:09:42 +00:00
Ales Huzik
0555f247dc nixos/bluetooth: allow to specify custom bluez package 2018-03-08 13:56:47 +11:00
Shea Levy
a183563cf0
Revert "Merge branch 'setuid-wrapper-readlink'" 
Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the
wrong NixOS test :(

This reverts commit 6dab907ebe, reversing
changes made to eab479a5f0.
 2018-03-07 17:09:05 -05:00
Michael Raskin
5a95fe2939
Merge pull request #36292 from xeji/xen-4-10 
xen: add v 4.10
 2018-03-07 22:07:14 +00:00
xeji
08894b4d8a xen 4.10: link /etc/xen/oxenstored.conf 
this is required for oxenstored to start
 2018-03-07 22:39:19 +01:00
xeji
fbc0b8282e xen: fix broken version comparisons 
string compare breaks with xen 4.10 (because "4.10" < "4.8")
 2018-03-07 22:37:40 +01:00
Vladyslav M
2a147bea02 iwd: 2017-12-14 -> 0.1 2018-03-07 20:28:12 +02:00
Shea Levy
6dab907ebe
Merge branch 'setuid-wrapper-readlink' 2018-03-07 12:44:21 -05:00
Shea Levy
dffa3d2b1f
nixos: setuid-wrapper: simplify readlink logic 2018-03-07 11:57:43 -05:00
Yegor Timoshenko
5905fe069b
tt-rss: use proper user and package for MySQL 2018-03-06 03:10:24 +00:00
Jörg Thalheim
5fe1be88a5
Merge pull request #36350 from volth/nix-serve 
nix-serve: nix 2.0 fixes
 2018-03-05 23:18:27 +00:00
Matthew Bauer
1e621ff423 demo: autologin through xserver 
also disable upower on virtualbox
Fixes #36348
 2018-03-05 14:48:01 -06:00
volth
30877b1ed8 nix-serve: nix 2.0 fixes 2018-03-05 19:32:42 +00:00
Frederik Rietdijk
8bcdb39a27
Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt 
nixos/networking-scripted: restore bridge slaves dynamically added by…
 2018-03-05 17:31:22 +00:00
Dino Dai Zovi
ddf13e6646 nixos/initrd-network: add udhcpc.extraArgs option (#36305) 
This can be used to fix issues where udhcpc times out before
acquiring a lease. For example of these issues, see:

https://bugs.alpinelinux.org/issues/3105#note-8

Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
 2018-03-05 15:53:59 +00:00
Franz Pletz
17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey 
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
 2018-03-05 10:02:39 +00:00
Will Fancher
6b9a99e55d LightDM: Set default user session when possible. 2018-03-04 23:54:09 +00:00
Vladimír Čunát
498374a8bd
Merge #35554: nixos/opengl: unhide and document 2018-03-04 17:33:01 +01:00
obadz
9dc62dd915
Merge pull request #36272 from obadz/nixos-lustrate-doc 
nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
 2018-03-04 16:21:54 +00:00
obadz
80ea345494 nixos-enter: specify absolute path to bash 
Not doing so makes it impossible to use nixos-enter from a non-NixOS
distro
 2018-03-04 16:19:52 +00:00
Vladimír Čunát
2069a2a002
Merge #35454: nixos/pump.io: remove 2018-03-04 10:49:25 +01:00
Vladimír Čunát
a2b8d8fbe2
nixos/pump.io: also comment-out the uid 2018-03-04 10:48:29 +01:00
Jörg Thalheim
a5dcde1a6f Revert "networkd: also load builtin modules" 
This reverts commit d514dc220e.

breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
 2018-03-04 06:29:08 +00:00
Tuomas Tynkkynen
1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Jörg Thalheim
6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents 
Openldap module declarative contents
 2018-03-03 19:00:13 +00:00
aszlig
0811e7f60e
nixos/netboot: Fix evaluation error 
The function arguments for make-squashfs.nix have changed in
df117acab7, so we need to change them here
as well.

The boot.netboot NixOS VM test now succeeds again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
 2018-03-03 19:31:19 +01:00
Jörg Thalheim
5d0d140f74
Merge pull request #34070 from lukeadams/prl-improve 
Improve parallels-tools
 2018-03-03 17:34:57 +00:00
Vladimír Čunát
b70c93f211
Merge branch 'master' into nix-2.0 2018-03-03 18:02:35 +01:00
Jörg Thalheim
9936ed4920
Merge pull request #31019 from teto/strongswan_rebased 
[RFC/RDY] make l2tp work with Strongswan
 2018-03-03 15:56:05 +00:00
Léo Gaspard
aeef7c91f1
openldap module: allow defining contents declaratively 2018-03-03 15:33:23 +01:00
Léo Gaspard
cca9ec2a66
openldap module: cleanup 2018-03-03 15:33:01 +01:00
Jan Tojnar
618ac29687
cantarell-fonts: rename from cantarell_fonts 2018-03-03 00:36:38 +01:00
wucke13
9580f22115 Solving #30396 2018-03-02 09:30:19 +01:00
Bjørn Forsman
5de8f99f03 nixos/jenkins: ensure postStart follows redirects 
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
 2018-03-02 08:48:38 +01:00
Shea Levy
2802101e9f
Merge branch 'dropbear-2018-76-fix' 2018-03-01 21:35:06 -05:00
Shea Levy
f2937b7485
initrd-ssh: Fix for new dropbear version. 
For some reason 2018.76 dropped the -m flag.
 2018-03-01 21:21:27 -05:00
Luke Adams
52747120c1 parallels: add package config option 
allows overriding of package with newer versions
 2018-03-01 17:09:13 -06:00
Luke Adams
2c5efdbec4 parallels: add autoMountShares option 2018-03-01 16:36:37 -06:00
Shea Levy
34487947ce
nixos: Add nixpkgs.crossSystem option for cross-compilation 2018-03-01 14:58:15 -05:00
Shea Levy
95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos 2018-03-01 14:56:58 -05:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell. 2018-03-01 14:38:53 -05:00
Shea Levy
948e290895
stage-2-init: Use the host bash as SHELL 2018-03-01 14:03:41 -05:00
Frederik Rietdijk
810dd0f984 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-01 20:00:42 +01:00
Shea Levy
897b7c7e9b
nixos: Fix initrd dependency detection when cross-compiling. 2018-03-01 13:31:36 -05:00
WilliButz
5ea2c87464
grafana: 4.6.3 -> 5.0.0 2018-03-01 17:50:09 +01:00
Shea Levy
c54730dde8
gobjectIntrospection: Enable building without X11 support. 
Also disable it when noXlibs in NixOS.
 2018-03-01 07:36:36 -05:00
lejonet
565f22d27a nixos/ceph: init module (#35299) 
All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides.
 2018-03-01 11:47:13 +00:00
Jörg Thalheim
12422149a7
Merge pull request #29768 from Mic92/networkd 
networkd: also load builtin modules
 2018-03-01 09:16:18 +00:00
Tuomas Tynkkynen
b8b2225f6b Merge remote-tracking branch 'upstream/master' into staging 2018-03-01 06:09:20 +02:00
Shea Levy
4d5be58a8f
Merge remote-tracking branch 'origin/master' into cross-nixos 2018-02-28 17:07:13 -05:00
Shea Levy
5ff15fbf7d
Merge branch 'nix-ssh-ng' 2018-02-28 17:04:19 -05:00
Shea Levy
4de72b90f3
nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
Jörg Thalheim
47ce3021a9
Merge pull request #36136 from hedning/nix-bash-completions-on-enableCompletion 
programs/bash: install nix-bash-completions if completion is enabled
 2018-02-28 21:23:53 +00:00
Frederik Rietdijk
cf0c20e0de
Merge pull request #35892 from Nadrieril/update-usbguard 
usbguard: 0.7.0 -> 0.7.2
 2018-02-28 20:30:30 +00:00
Sander van der Burg
8fbfd67f1f disnix module: make dbus service configurable 2018-02-28 21:29:24 +01:00
Shea Levy
fe406d66b2
nixos: sudo: Use build-time visudo for syntax check. 2018-02-28 15:01:33 -05:00
Shea Levy
8e6520540e
nixos: keymap: Fix cross-compilation. 2018-02-28 15:01:32 -05:00
Shea Levy
cc81202293
nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation. 2018-02-28 15:01:32 -05:00
Shea Levy
b28cb72908
nixos: stage-1: Don't try to test binaries when cross-compiling. 2018-02-28 15:01:32 -05:00
Shea Levy
aebb024b2f
nixos: Take glibcLocales from buildPackages. 
No need to cross-compile pure data...
 2018-02-28 15:01:32 -05:00
Shea Levy
c0e814a434
nixos: udev: Generate hwdb with build-native udevadm. 2018-02-28 15:01:31 -05:00
Shea Levy
a929301281
nixos: kexec: Disable on non-keexecable systems. 2018-02-28 15:01:31 -05:00
Tuomas Tynkkynen
34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
 2018-02-28 20:52:49 +02:00
Tor Hedin Brønner
c58072309c programs/bash: install nix-bash-completions if completion is enabled 2018-02-28 19:13:02 +01:00
Bas van Dijk
85abad9e1c strongswan-swanctl: fixed type of 'file' options 2018-02-28 12:01:31 +01:00
Bas van Dijk
018f66020f strongswan-swanctl: disable the structured strongswan config for now in favour of a literal config 
This reduces the number of option by over 600.
 2018-02-28 11:44:22 +01:00
Bas van Dijk
592a89befc strongswan-swanctl: support strongswan-5.6.2 configuration options 2018-02-28 11:04:41 +01:00
Bas van Dijk
7c94804680 strongswan-swanctl: don't generate options for charon 
This reduces the number of options from 1152 to 756.
 2018-02-28 10:41:54 +01:00
Bas van Dijk
7cc5ee2354 strongswan-swanctl: support strongswan-5.6.1 configuration options 
I determined which options got changed by executing the following
commands in the strongswan repository:

  git diff -U20 5.6.0..5.6.1 src/swanctl/swanctl.opt
  git diff -U20 5.6.0..5.6.1 conf
 2018-02-28 10:41:54 +01:00
Bas van Dijk
bd24b3addd nixos: add the strongswan-swanctl service 
The strongswan-swanctl systemd service starts charon-systemd. This implements a IKE daemon
very similar to charon, but it's specifically designed for use with systemd. It uses the
systemd libraries for a native integration.

Instead of using starter and an ipsec.conf based configuration, the daemon is directly
managed by systemd and configured with the swanctl configuration backend.

See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd

Note that the strongswan.conf and swantctl.conf configuration files are automatically
generated based on NixOS options under services.strongswan-swanctl.strongswan and
services.strongswan-swanctl.swanctl respectively.
 2018-02-28 10:41:54 +01:00
David Asabina
e41ca3b347 digitalbitbox: init at 2.2.2 (#33787) 
* digitalbitbox: init at 2.2.2

The commits that lead to this have been squashed from independent
commits see branch @vidbina/add/digitalbitbox-wip that did the
following:
 - 0a3030fa0ec digitalbitbox: init at 2.2.2
 - c18ffa3ffd4 digitalbitbox: moved meta to EOF
 - 0c5f3d6972a digitalbitbox: using preConfigure + configureFlags
 - a85b1dfc3fd digitalbitbox: nativeBuildInputs
 - 90bdd35ef0f digitalbitbox: autoreconfHook
 - 91810eea055 digitalbitbox: default installPhase & makeWrapper
 - 90e43fb7e2a digitalbitbox: doc rm $PWD hack & printf-tee deal
 - fd033b2fe5a digitalbitbox: cleanup, alphabetically sort attrs
 - c5907982db3 digitalbitbox: added hardware module
 - 88e46bc9ae0 digitalbitbox: added program module
 - amend to change name: dbb-app -> digitalbitbox
 - amend to add install instructions based on feedback
 (https://github.com/NixOS/nixpkgs/pull/33787#issuecomment-362813149)
 - amend to add longDescription
 - moved program to its own dir
 - overridable udev rules handling
 - added docs to manual
 - added package attr to program module
 - added package attr to hardware module

* digitalbitbox: use libsForQt5.callPackage
 2018-02-27 22:40:22 +00:00
Eelco Dolstra
9fc786c3a4
Create /home with the right permissions 
Without this, it will be created with 700 permissions.
 2018-02-27 20:28:49 +01:00
Eelco Dolstra
84f93dd07a
nixos-install: Create /root/.nix-defexpr 
This was previously done by nixos-prepare-root.
 2018-02-27 20:21:23 +01:00
Eelco Dolstra
b14d9e1568
Add jq to the installation media 
This is required by closureInfo.
 2018-02-27 20:20:37 +01:00
Eelco Dolstra
212dd84dd2
Cleanup 2018-02-27 20:03:12 +01:00
Eelco Dolstra
cc2eeef4ab
Fix installing the Nixpkgs channel on the installation media 
And test that it got installed correctly.
 2018-02-27 19:58:23 +01:00
Nadrieril
297fac40ca nixos/usbguard: Do not check permissions on rules file (using undocumented -P flag) 2018-02-27 18:34:02 +00:00
Rodney Lorrimar
21dcead5f0
nixos/pump.io: remove 
This would probably be better maintained in a separate repo as an
external NixOS module which gets imported into user's configuration.
 2018-02-27 12:52:51 +00:00
Vladimír Čunát
6168c2e45f
Merge master into staging 
This is to cleanup the (re-)revert of merge to master.
 2018-02-26 22:55:11 +01:00
Aristid Breitkreuz
b8f4df9d9e attempt to fix #30940 more robustly 2018-02-26 22:19:12 +01:00
Frederik Rietdijk
4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
Franz Pletz
37c009ca74
Merge pull request #34028 from florianjacob/matomo 
piwik is now matomo
 2018-02-26 06:53:58 +00:00
Peter Hoeg
095260a1c9 nixos udevil: set up wrapper for udevil 2018-02-26 14:30:22 +08:00
Peter Hoeg
f9cc3c08e2
Merge pull request #35432 from timokau/syncthing-deprecate-inotify 
syncthing,qsyncthingtray: remove syncthing-inotify
 2018-02-26 11:04:33 +08:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Linus Heckemann
c255b10818 nixos/opengl: unhide and document enable option 2018-02-25 16:34:34 +00:00
Sarah Brofeldt
2ea8f8acdf nixos/mysql: Unbreak initial database creation 2018-02-24 20:07:55 +01:00
Jörg Thalheim
c0b652d6cd
Merge pull request #35461 from lheckemann/grub-by-id 
grub module: suggest by-id paths for devices
 2018-02-24 11:30:34 +00:00
Linus Heckemann
fd77a08b34 grub module: suggest by-id paths for devices 
Since they are more stable, their use should be encouraged over that of
potentially volatile identifiers like /dev/[sh]da.
 2018-02-24 10:50:23 +00:00
Timo Kaufmann
5643128ff2 syncthing,qsyncthingtray: remove syncthing-inotify 
syncthing-inotify is replaced by the new syncthing "fswatcher" feature.
 2018-02-24 01:08:44 +01:00
Tuomas Tynkkynen
ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
Aristid Breitkreuz
e349ccc77f nixos/alsa: Do not make sound.enable conditional on stateVersion. 
Eelco Dolstra wrote:

Hm, this is not really the intended use of stateVersion. From the description:

        Every once in a while, a new NixOS release may change
        configuration defaults in a way incompatible with stateful
        data. For instance, if the default version of PostgreSQL
        changes, the new version will probably be unable to read your
        existing databases. To prevent such breakage, you can set the
        value of this option to the NixOS release with which you want
        to be compatible. The effect is that NixOS will option
        defaults corresponding to the specified release (such as using
        an older version of PostgreSQL).

So this is only intended for options that have some corresponding on-disk state. AFAICT this is not the case for sound. In any case stateVersion is a necessary evil that only exists because we can't just upgrade Postgres databases or change SSH host keys. It's not necessary for things like whether sound is enabled. (If the user discovers that sound is suddenly disabled, they can just enable it.)

I had some vague recollection that we also had a configVersion option setting to control the defaults for non-state-related options, but I can't find it so maybe it was only discussed.
 2018-02-23 23:14:42 +01:00
volth
270f99f7bf
nixos/programs.chromium: write policies for google-chrome too 
Policy configuration files live under /etc/chromium for Chromium, and under /etc/opt/chrome for Google Chrome.
 2018-02-23 19:00:26 +00:00
Tom Bereknyei
034d3fae3d tinc: enable invitations 2018-02-23 11:59:37 -05:00
Jan Tojnar
3b512ca185
Merge pull request #35065 from jtojnar/fwupd-1.0.5 
fwupd: 1.0.5 update & cleanups
 2018-02-23 17:22:47 +01:00
Nikolay Amiantov
9c1c424e52 cups service: fix client sockets 
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
 2018-02-23 18:51:39 +03:00
Nikolay Amiantov
cc52eff6c6 Revert "cups service: fix client sockets" 
This reverts commit cf4c077343.
 2018-02-23 18:47:43 +03:00
Nikolay Amiantov
cf4c077343 cups service: fix client sockets 
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
 2018-02-23 18:43:51 +03:00
Jörg Thalheim
df4963daca
Merge pull request #35343 from gnidorah/softether 
softether module: fix dataDir option
 2018-02-23 12:38:11 +00:00
Franz Pletz
6180eda1e4
Merge pull request #35026 from alesguzik/acpid_log_events 
nixos/acpid: add option to log events
 2018-02-23 04:36:33 +00:00
Franz Pletz
278bc22498
Merge pull request #31619 from NeQuissimus/exclude_rtl8723bs 
rtl8723bs: Only include in enableAllFirmware if valid
 2018-02-23 04:10:45 +00:00
volth
985a4bb87c
nixos/tox-bootstrapd: new command line format 2018-02-23 03:26:18 +00:00
Franz Pletz
4e4ae18c19
browserpass module: add firefox support 2018-02-23 00:25:40 +01:00
Franz Pletz
7ea15ef9c6
nixpkgs module: update config example 
firefox.enableGeckoMediaPlayer does not exist anymore.
 2018-02-23 00:21:15 +01:00
Franz Pletz
0dcf5df0ed
Merge pull request #34470 from WilliButz/fix-xautolock 
nixos/xautolock: fix default defaults/examples, add assertions
 2018-02-22 23:10:03 +00:00
Aristid Breitkreuz
a43e33d0e4 nixos: disable sound by default, if stateVersion >= 18.03 (#35355) 2018-02-22 22:06:31 +00:00
Florian Jacob
885e762d47 nixos/matomo: improve serverName default 
when we need to change it anyway for the rename.
 2018-02-22 22:03:55 +01:00
Florian Jacob
48e449ee70 nixos/piwik: rename to matomo 2018-02-22 22:03:55 +01:00
volth
eef641aa6d
nixos/label: no prepend '-' if there are no tags 2018-02-22 19:44:21 +00:00
volth
073d3f0869
nixos/programs.chromium: remove unicode char '↪' 2018-02-22 17:55:33 +00:00
Frederik Rietdijk
d328ba753e
Merge pull request #35243 from FRidh/postgis 
postgis: get rid of composableDerivation
 2018-02-22 16:49:56 +00:00
Eelco Dolstra
d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0 2018-02-22 17:28:51 +01:00
Eelco Dolstra
32af695a22
nix: 1.11.16 -> 2.0 2018-02-22 17:03:27 +01:00
gnidorah
fbeb32994b softether module: fix dataDir option 2018-02-22 18:37:59 +03:00
Tim Steinbach
9f71de75af
rtl8723bs: Only include in enableAllFirmware if valid 2018-02-22 08:52:50 -05:00
Jan Tojnar
30cc156c8c
nixos/fwupd: use manual list of etc files 
Closes: #32142
 2018-02-22 13:18:23 +01:00
Markus Hauck
1c3c80360b logkeys.service: Add 'device' option 2018-02-21 18:16:14 +01:00
Ales Huzik
444cdf0454 nixos/acpid: add option to log events 2018-02-21 22:17:33 +11:00
Marti Serra
30f27c49b9 crashplan-small-business: remove unneeded function 2018-02-21 09:25:58 +01:00
Raymond Gauthier
de1d486265 brscan4 module: Added to modules-list.nix. 
As requested by multiples users in #20632.
 2018-02-20 19:35:33 -05:00
Frederik Rietdijk
b2f53c76f8 postgis: get rid of composableDerivation 
In this change composableDerivation is removed in favor of
stdenv.mkDerivation.
 2018-02-20 22:17:16 +01:00
Will Dietz
ce3de0399b
Merge pull request #30057 from dtzWill/feature/webos-novacomd 
webos: init novacom, novacomd, cmake-modules; add nixos service
 2018-02-20 13:49:06 -06:00
Joachim F
46afc63b6f
Merge pull request #32062 from volth/patch-73 
nixos/varnish: check .vcl syntax at compile time
 2018-02-20 19:22:28 +00:00
Joachim F
b30fae01cd
Merge pull request #32761 from xvapx/crashplan-small-business 
crashplan-small-business: init at 6.6.0
 2018-02-20 19:19:22 +00:00
Will Dietz
e5e29284a9 webos: init novacom, novacomd, cmake-modules; add nixos service 2018-02-20 10:34:19 -06:00
Franz Pletz
3942cbea67
Merge pull request #35161 from volth/patch-92 
nixos/nat: support nat reflection
 2018-02-20 16:26:26 +00:00
Franz Pletz
17952ee589
Merge pull request #35141 from abbradar/dhcpcd-order 
dhcpcd service: fix service dependencies when default gateways are set
 2018-02-20 16:07:49 +00:00
zimbatm
3b30e4355b
Merge pull request #35129 from rvl/buildkite-agent-hooks 
buildkite-agent service: declarative hooks and extraConfig option
 2018-02-20 11:28:42 +00:00
Richard Marko
7367918f44 nixos/nixops-dns: init (#34511) 2018-02-20 10:14:55 +00:00
Rodney Lorrimar
e552633c20
nixos/buildkite-agent: add coreutils to PATH of service 
This simplifies the service script and it's probable that many builds
will need coreutils anyway.
 2018-02-20 08:17:14 +00:00
Rodney Lorrimar
21e9a3eb6f
nixos/buildkite-agent: add a default value for name option 
Use the default name value from:
https://buildkite.com/docs/agent/configuration
 2018-02-20 08:17:14 +00:00
Rodney Lorrimar
8132b24cdf
nixos/buildkite-agent: remove obsolete config setting 
Newer versions of buildkite-agent can find the bootstrap script
themselves.
 2018-02-20 08:17:13 +00:00
Rodney Lorrimar
cf6463aa8c
nixos/buildkite-agent: enhance documentation for meta-data option 
I assumed they were space-separated, which was wrong.

In future it might be better to allow specifying an attrset of strings
for the option.
 2018-02-20 08:17:13 +00:00
Rodney Lorrimar
66586c86b9
nixos/buildkite-agent: declarative hooks configuration 
Instead of having to set up a directory containing hook scripts, you
can now directly set module options to add hooks.
 2018-02-20 08:17:12 +00:00
Rodney Lorrimar
efefba7c9b
nixos/buildkite-agent: add extraConfig option 
This is useful for things like enabling debugging and increasing agent
priority, which don't warrant extra module options.
 2018-02-20 08:17:12 +00:00
Nikolay Amiantov
d77984f571 network-interfaces-scripted service: delay setup if IPv6 is disabled 
Even if IPv6 gateway is set, there's no need to set it early if IPv6 is disabled.
 2018-02-19 23:33:54 +03:00
Nikolay Amiantov
5ff25fcd7e dhcpcd service: want for both IP stacks 
We want to wait for both stacks to be active before declaring that network is active.
So either both default gateways must be specified or only IPv4 if IPv6 is disabled to
avoid dhcpcd for network-online.target.
 2018-02-19 23:33:54 +03:00
Nikolay Amiantov
996ed0830e dhcpcd service: always want by multi-user 
When default gateways were specified the service wasn't wanted by anything at
all before.
 2018-02-19 23:31:45 +03:00
Moritz Ulrich
2cafea200c Virtualbox: Fix type error in networking.interfaces.vboxnet0.ipv4.addresses 
This error introduced in e239c1e582
prevented evaluation on my machine.
 2018-02-19 17:48:15 +01:00
Tim Steinbach
0500cf79af
plymouth: Fix reference to NixOS version 2018-02-19 11:05:32 -05:00
Michael Raskin
1e23a5a6e9
Merge pull request #34795 from oxij/os/nixosLabel-pt2 
nixos: labels part 2
 2018-02-19 14:45:17 +00:00
Michael Raskin
10b3f7d356
Merge pull request #27688 from rnhmjoj/routes 
nixos/networking-interfaces: make static routes configurable
 2018-02-19 14:12:58 +00:00
volth
328f8a6cba nixos/nat: support nat reflection 2018-02-19 13:16:09 +00:00
Shea Levy
c64639b54c
nixos/binfmt: Initial binfmt_msc support. 2018-02-18 12:42:17 -05:00
Jan Malakhovski
c6d8a58e8d nixos: allow overriding labels with environment variables 
This reintroduces a better version of what 2a05368ff3 removed.
 2018-02-18 12:56:31 +00:00
Jan Malakhovski
0fd8ce96ac nixos: introduce system.nixos.tags 2018-02-18 12:56:31 +00:00
Jan Malakhovski
2e6b796761 nixos: rename config.system.nixos* -> config.system.nixos.* 2018-02-18 12:56:30 +00:00
Jan Malakhovski
09512be289 nixos: use nixosLabel in more places 2018-02-18 12:56:30 +00:00
Jan Malakhovski
8200e08b0b nixos: move nixosLabel to its own module 2018-02-18 12:56:30 +00:00
Jan Malakhovski
e1782e342f nixos: add system.boot.loader.initrdFile option and use it where appropriate 2018-02-18 12:56:29 +00:00
Bjørn Forsman
d84f18e288 nixos/postfix: document that *Alias options support comma separated values 
For the longest time I thought there could be only one rootAlias.
 2018-02-18 13:04:08 +01:00
Silvan Mosberger
c2b8d14b56
nixos/znapzend: fix when no previous zetup 
When the znapzend module was enabled for the first time with pure =
true; then the list of previous entries is empty, but xargs still tried
to execute a znapzendzetup delete command with no arguments, which made
it fail
 2018-02-17 15:50:48 +01:00
rnhmjoj
e81811a579
nixos/modules: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
rnhmjoj
e239c1e582
nixos/tests: rename IP addresses/routes options 2018-02-17 14:57:07 +01:00
rnhmjoj
c1bed05e34
nixos/networking-interfaces: rename IP addresses/routes options 2018-02-17 14:01:24 +01:00
rnhmjoj
f41111c4da
nixos/tests: add test for static routes 2018-02-17 14:01:23 +01:00
rnhmjoj
d00c91c5da
nixos/networking-interfaces: make static routes configurable 2018-02-17 13:57:58 +01:00
Alexei Robyn
ab45e13e07 nixos/dante: order after network-online.target (#34435) 
network-online.target properly depends on the underlying network
management tool (e.g. NixOS static configuration scripts, dhcpcd,
NetworkManager, networkd) signalling that all interfaces are up and
appropriately configured (to whatever degree possible/required), whereas
network.target only indicates that the network management tool itself
has started.
 2018-02-17 10:18:05 +00:00
Joachim F
faf072166b
Merge pull request #29869 from Nadrieril/syncserver-fup 
syncserver service: follow-up of #28189
 2018-02-17 10:09:42 +00:00
Niklas Hambüchen
f00a1514f9 nixos/nginx: validate config syntax in preStart (#24664) 2018-02-17 09:45:25 +00:00
Joachim F
71a32c36fe
Merge pull request #34587 from netixx/add-freeradius-service 
nixos/freeradius : init - Added freeradius service
 2018-02-17 09:17:35 +00:00
Joachim F
cac0d0eb33
Merge pull request #34803 from mt-caret/lxd-partial-fix 
nixos/lxd: partial fix for lxd breakage
 2018-02-17 09:08:08 +00:00
Joachim F
7bf049a54c
Merge pull request #34492 from rnhmjoj/privacy 
nixos/networking-interfaces: add preferTempAddress option
 2018-02-17 08:41:23 +00:00
Matthieu Coudron
1912870a6e nixos/boot: allow kernel.printk override (#34958) 
At one point in my configuration I had:
boot.kernel.sysctl = {
      # https://unix.stackexchange.com/questions/13019/description-of-kernel-printk-values
      "kernel.printk" = "4	4	1	7";
};
which triggered:

error: The unique option `boot.kernel.sysctl.kernel.printk' is defined multiple times, in `/home/teto/dotfiles/nixpkgs/mptcp-unstable.nix' and `/home/teto/nixpkgs/nixos/modules/system/boot/kernel.nix'.
(use ‘--show-trace’ to show detailed location information)
Traceback (most recent call last):
  File "/home/teto/nixops/scripts/nixops", line 984, in <module>
    args.op()
  File "/home/teto/nixops/scripts/nixops", line 406, in op_deploy
    max_concurrent_activate=args.max_concurrent_activate)
  File "/home/teto/nixops/nixops/deployment.py", line 1045, in deploy
    self.run_with_notify('deploy', lambda: self._deploy(**kwargs))
  File "/home/teto/nixops/nixops/deployment.py", line 1034, in run_with_notify
    f()
  File "/home/teto/nixops/nixops/deployment.py", line 1045, in <lambda>
    self.run_with_notify('deploy', lambda: self._deploy(**kwargs))
  File "/home/teto/nixops/nixops/deployment.py", line 985, in _deploy
    self.configs_path = self.build_configs(dry_run=dry_run, repair=repair, include=include, exclude=exclude)
  File "/home/teto/nixops/nixops/deployment.py", line 653, in build_configs
    raise Exception("unable to build all machine configurations")
Exception: unable to build all machine configurations

This simple addition allows to override it.
 2018-02-17 06:47:33 +00:00
Tim Steinbach
87559028ef
Merge pull request #33954 from kuznero/pr/kubernetes 
kubernetes: 1.7.9 -> 1.9.1
 2018-02-16 13:56:59 +00:00
Vladimír Čunát
b5aaaf87a7
Merge staging and PR #35021 
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
 2018-02-16 09:13:12 +01:00
Herwig Hochleitner
b7b2a4ffa4 connmand: add extraFlags option to service 2018-02-15 23:37:12 +01:00
Nikolay Amiantov
56e0943b08 makeModulesClosure: support firmware 
Link it in stage 1.
 2018-02-16 00:11:07 +02:00
Herwig Hochleitner
23b5421c46 nixos: make boot.kernel.features internal 
This isn't useful as public API. It should be used by options to
activate kernel features for use with specific programs.
 2018-02-15 09:10:32 +01:00
Herwig Hochleitner
28875192ae programs.systemtap: add nixos option for installing systemtap 
also enables debug feature on kernel
 2018-02-15 09:10:32 +01:00
Herwig Hochleitner
66080ae4d8 programs.criu: add nixos option for installing criu + kernel flags 2018-02-15 09:10:32 +01:00
Herwig Hochleitner
0b621321cd boot.kernel.features: add nixos option for setting kernel features 
this allows setting the features attribute for
pkgs/os-specific/linux/kernel/common-config.nix
 2018-02-15 09:10:32 +01:00
Franz Pletz
79e7f7af9a
radvd service: fix due to systemd upgrade 
After the systemd 237 upgrade, radvd wouldn't start anymore because the
PID file cannot be written. It seems that directories in /run has to be
explicitely defined as RuntimeDirectory now. The PID file isn't needed
due to systemd, though, so it was removed along with forking and loggia
via syslog.

This fixes the ipv6 NixOS test.
 2018-02-15 07:02:08 +01:00
Jan Tojnar
640916d55d
nixos/fwupd: add maintainers 2018-02-15 01:11:13 +01:00
Sam Parkinson
16fa6f59f7
nixos/plotinus: add module to enable plotinus 2018-02-14 22:25:12 +01:00
Frederik Rietdijk
177cfe3370
Merge pull request #34974 from dotlambda/prosody 
nixos/prosody: add package option
 2018-02-14 20:35:01 +00:00
Frederik Rietdijk
672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00