Joachim Fasting
6977b94e9b
Revert "xserverArgs fuckup"
...
This reverts commit c2922a9157
.
See https://github.com/NixOS/nixpkgs/issues/19930
While the above commit is designed to allow GDM to work, it appears to
break other use cases. In particular, it breaks tests involving X
usage (e.g., i3wm[1] and firefox[2]), which makes it difficult to assess
the impact of other changes and so hampers development of unrelated
features.
https://hydra.nixos.org/build/42852015
https://hydra.nixos.org/build/42851666
2016-10-28 19:30:12 +02:00
Joachim F
1da6dd3eee
Merge pull request #19875 from joachifm/cjdns-for-upstream
...
Cjdns module enhancments
2016-10-28 13:01:58 +02:00
Joachim Fasting
8180922d23
cjdns service: refactor cjdns hosts builder
...
The old version would export two lists to a bash builder and do pairwise
processing on the bash side. In the new version we instead generate a
logic free builder on the Nix side. This is not only conceptually
simpler but reduces the amount of code and intermediate values.
2016-10-27 14:15:54 +02:00
Joachim Fasting
9654e09b5a
cjdns service: ensure that generated passwd has requested length
...
`head -cNUM ... | tr -dc SET` might generate output containing fewer
than NUM characters. Given the limited alphabet, this could result in a
fairly weak passphrase. The construction `tr </dev/urandom | head
-cNUM`, however, is sure to give us the full `NUM`.
2016-10-27 14:15:53 +02:00
Joachim Fasting
e94bd6f31d
cjdns service: protect /home and /tmp
2016-10-27 14:15:52 +02:00
Joachim Fasting
5fba586650
cjdns service: better types
...
- types.string -> str, string is deprecated
- change type of confFile option to nullOr path, makes more sense
2016-10-27 14:15:52 +02:00
Joachim Fasting
afe67f28a3
cjdns service: use cfg.enable shortcut
2016-10-27 14:15:51 +02:00
Joachim Fasting
79d216b8f4
cjdns service: whitespace cleanup
2016-10-27 14:15:51 +02:00
Joachim F
371a595f3c
Merge pull request #19874 from joachifm/opensmtpd-refactorings
...
Opensmtpd module refactorings
2016-10-27 13:39:09 +02:00
Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Joachim Fasting
ab1e216942
opensmtpd service: remove redundant wants network.target
...
Already part of normal bootup.
2016-10-26 03:01:56 +02:00
Joachim Fasting
f24ffc4919
opensmtpd service: require serverConfiguration
...
If the daemon won't function without a valid config, it makes no sense
to default to an empty config. Instead, turn that case into a build
failure.
2016-10-26 03:01:56 +02:00
Joachim Fasting
3851afc8eb
opensmtpd service: path -> package for option procPackages
2016-10-26 03:01:56 +02:00
Joachim Fasting
946fe73b56
opensmtpd service: use explicit pkgs for consistency
2016-10-26 03:01:56 +02:00
Joachim Fasting
37afc5cda1
opensmtpd service: serviceConfiguration option as types.lines
2016-10-26 03:01:56 +02:00
Bjørn Forsman
cd1b09af5d
nixos/tftpd: change default dir from /home/tftp to /srv/tftp
...
/home is for real users. /srv is recommended by FHS (although there is
no consensus for what to name subdirs under /srv).
2016-10-25 17:20:52 +02:00
Bjørn Forsman
d03dbfcbb8
nixos/tftpd: mention that it runs as an xinetd service
2016-10-25 17:20:52 +02:00
Domen Kožar
1622a21c68
Merge pull request #19453 from ryantrinkle/openfire-fix
...
openfire: fix service expression
2016-10-24 11:35:16 +02:00
Joachim F
bdc4397303
Merge pull request #19805 from joachifm/startAt-fixups
...
Fixup remaining uses of startAt
2016-10-23 20:39:53 +02:00
Emery Hemingway
7c6a4e6c35
nixos/octoprint: fixup extraConfig
2016-10-23 19:47:28 +02:00
Emery Hemingway
b675619391
nixos: use types.lines for extraConfig
2016-10-23 19:41:43 +02:00
Joachim Fasting
4c41c412a0
nix gc service: fix use of startAt
...
`startAt = ""` as in `startAt = optionalString false ...` results
in an invalid timer unit (due to "" being promoted to a singleton
list and not filtered out).
Ref: c9941c4b5e
2016-10-23 17:56:49 +02:00
Jörg Thalheim
eb3f23d9ba
openldap: apply correct type for configDir
...
null is not a path
2016-10-23 16:00:22 +02:00
Kranium Gikos Mendoza
1e3f622dbd
openldap: set configDir as null
...
fixes an error #19794 with this new option f3404b7
when using plain configuration files
2016-10-23 11:55:23 +00:00
Bram Duvigneau
f1d45add3b
brltty: 5.2 -> 5.4
2016-10-22 22:03:45 +00:00
Jörg Thalheim
fba9d231b4
Merge pull request #17394 from schneefux/znc-module
...
ZNC: 1.6.2 -> 1.6.3, push 2015-12-07 -> 2016-07-28, module refactor
2016-10-22 19:58:24 +02:00
Alexander Ried
459da7b86e
gnome3: default to 3.22 ( #19743 )
...
* gnome3: default to 3.22
* zuki-themes: add src for gnome 3.22, remove 3.18
* gnome3_22.vte_290: copy from gnome3.20
* termite: use vte-select-text from gnome3_20
2016-10-22 19:54:20 +02:00
Jörg Thalheim
4bb91b315d
Merge pull request #19601 from Hinidu/fix/neo4j-update-3
...
neo4j: 2.1.3 -> 3.0.6
2016-10-22 19:49:37 +02:00
Jörg Thalheim
fafe3ec40a
Merge pull request #19624 from bjornfor/improve-atftpd-service
...
nixos/atftpd: various improvements
2016-10-22 18:08:53 +02:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
obadz
cf94cdb59b
lightdm module: require accounts daemon module
2016-10-22 14:46:00 +01:00
schneefux
ee42e000dd
znc module: refactor
2016-10-22 13:52:20 +02:00
Jörg Thalheim
b0c38f450f
Merge pull request #19347 from cedeel/bspwm-git
...
bspwm-unstable: init at 2016-09-30
2016-10-22 11:49:24 +02:00
Jörg Thalheim
6f99aa9a7e
Merge pull request #19289 from DerTim1/openldap-add-configDir-option
...
openldap: add configDir option
2016-10-22 09:33:15 +02:00
Jörg Thalheim
20383d2606
Merge pull request #19635 from nhooyr/sshgen
...
sshd: separate key generation into another service
2016-10-21 23:40:16 +02:00
uwap
42e93b5f2a
quassel-webserver: init at 2.1.1
2016-10-21 23:31:50 +02:00
Anmol Sethi
1a74eedd07
sshd: separate key generation into another service
...
Fixes #19589
2016-10-20 23:14:37 -04:00
Joachim F
858f54dd88
Merge pull request #19664 from eqyiel/revert-19591-master
...
Revert "matrix-synapse: Pass required --report-stats opt"
2016-10-21 01:47:12 +02:00
Tim Steinbach
99d9d32899
Merge pull request #19668 from groxxda/timers
...
systemd.timers: automatically convert string to list
2016-10-20 17:37:28 -04:00
Vladimír Čunát
4d5b893002
Merge #19081 : gnome-3.22
...
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Tim Steinbach
0cbc4551ed
Merge pull request #19729 from groxxda/supplicant
...
supplicants: fix wants and wantedBy
2016-10-20 16:39:59 -04:00
Jörg Thalheim
5f886fb8cb
Merge pull request #19262 from chris-martin/riemann-health-ps
...
Fix riemann-health service (add missing procps dependency)
2016-10-20 22:11:43 +02:00
Alexander Ried
57d9c69c6a
supplicant: fix wants and wantedBy
2016-10-20 20:17:17 +02:00
Eelco Dolstra
e6bcff4d53
display-manager: Require systemd-udev-settle.service
...
It was already ordered after systemd-udev-settle.service, but that
doesn't do anything if no other units require
systemd-udev-settle.service. This was causing random failures during X
server startup, e.g.
machine# [ 12.691372] display-manager[607]: (EE) open /dev/dri/card0: No such file or directory
http://hydra.nixos.org/build/41062823
2016-10-20 17:49:40 +02:00
Robin Gloster
d05d063572
nginx: set correct acme permissions
2016-10-20 11:18:25 +02:00
Robin Gloster
c2eb39faba
gitlab: start sidekiq when starting gitlab
2016-10-20 11:18:21 +02:00
Peter Hoeg
1026bebee6
syncthing: use service files from upstream
...
Currently only for the user services as NixOS handles the named system
instances slightly differently.
syncthing and syncthing-inotify are done the same way.
There are 4 parts to this:
1) Copy in the upstream unit files
2) Make the nixos module use the definition from upstream
3) Enable restarting of all instances (system and user) on resume
4) Allow the traffic in the firewall on default ports if wanted
fixes #18973
2016-10-19 21:20:57 +02:00
Ryan Trinkle
928341132e
openfire: fix service expression
...
openfire is not in scope
2016-10-19 11:06:07 -04:00
Alexander Ried
89ef1a1756
nix-optimise module: fix startAt
2016-10-19 02:22:12 +02:00
Ruben Maher
2e0d0af1c8
Revert "matrix-synapse: Pass required --report-stats opt"
2016-10-19 08:28:38 +10:30