3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6109 commits

Author SHA1 Message Date
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
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
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
Eelco Dolstra e6088f77be initrd: Include i8042 kernel module
For some reason, between Linux 4.4.19 and 4.4.20, the atkbd and libps2
kernel modules lost their dependency on i8042 in modules.dep, causing
i8042 not to be included in the initrd. This breaks keyboard in the
initrd, in turn breaking LUKS.

This only happens on the 16.03 branch; on 16.09, it appears i8042 is
pulled into the initrd anyway (through some other dependency,
presumably). But let's include it explicitly.

http://hydra.nixos.org/build/40468431
2016-10-21 14:27:11 +02:00
Domen Kožar 41c490b75e acme: we do want to support ipv4 afterall 2016-10-21 13:25:11 +02:00
Domen Kožar d8f21b3ca3 acme: provide full nginx example
(cherry picked from commit 2af7382f76)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-10-21 13:19:04 +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
Tim Steinbach 42093f3592 Merge pull request #19722 from ericsagnes/feat/nspawn-optionSet
nspawn module: optionSet -> submodule
2016-10-20 12:45:25 -04:00
Eric Sagnes 87318e9820 nspawn module: optionSet -> submodule 2016-10-21 01:31:54 +09: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
Alexander Ried 8bb4fc1039 systemd.timers: filter timers with empty startAt 2016-10-19 02:22:12 +02:00
Alexander Ried 89ef1a1756 nix-optimise module: fix startAt 2016-10-19 02:22:12 +02:00
Alexander Ried c9941c4b5e systemd.timers.startOn: automatically convert string to list 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
Nikolay Amiantov 0842bc94e5 cachefilesd service: init 2016-10-16 19:58:33 +03:00
Bjørn Forsman 8cbdd9d0c2 nixos/release-notes: move "PHP config-file-scan-dir" from 16.09 to 17.03
Commits

  351d12437 ("nixos/release-notes: PHP config-file-scan-dir /etc -> /etc/php.d")
  41c8aa8d6 ("php: change config-file-scan-dir from /etc to /etc/php.d")

were merged to master _after_ NixOS 16.09. Commit 351d12437 then wrongly
updated the NixSO 16.09 release notes. Fix by moving the entry to NixOS
17.03.
2016-10-16 17:21:24 +02:00
Ruben Maher 443d833947 matrix-synapse: Pass required --report-stats opt 2016-10-16 18:12:54 +10:30
Chris Darnell 137ce58317 bspwm-unstable: init at 2016-09-30 2016-10-16 01:28:11 -04:00
Graham Christensen 31b286467c
hound: Add description to services.hound.config 2016-10-15 19:09:33 -04:00
Benno Fünfstück 796264a708 nixos/avahi: use more upstream-like systemd units
The new units mirror the upstream systemd units as closely as possible.
I could not find a reason why the service would need to be restarted on
resuming from suspend, and the upstream units also do not contain such a
restriction, so I removed the `partOf = [ "post-resume.target"]`.
This fixes #19525.
2016-10-15 22:51:39 +02:00
Alexander Ried 4094d63dea NetworkManager-strongswan: init at 1.4.0 2016-10-15 20:32:16 +02:00
Alexander Ried c2922a9157 xserverArgs fuckup
gnome-x-session provides good defaults which we really should not
override.
We have to add assertions to gdm.nix if the user specified one of those.

enableTCP must be configured through a gnome setting

dunno why we have terminate but it probably breaks stuff

We should expose configFile so we can use it from gdm module.
2016-10-15 20:32:14 +02:00
Alexander Ried 56d24b8e1d gdm module: enable user dbus session 2016-10-15 20:32:14 +02:00
Alexander Ried a5aa926902 gdm module: only make xserver args overrideable 2016-10-15 20:32:14 +02:00
Alexander Ried 5125161a77 gnome3_22.gnome-session: lookup of gnome-settings-daemon.desktop 2016-10-15 20:32:14 +02:00
Alexander Ried 50adbbe65c displayManager.gdm: only gnome-session needs to be on path 2016-10-15 20:32:12 +02:00
Alexander Ried e8ade4ff78 gnome3.gvfs module: make systemd services available 2016-10-15 20:32:12 +02:00
Alexander Ried 38212f6a0f gnome3.tracker module: add self to systemd path
fixes GDBus.Error:org.freedesktop.systemd1.NoSuchUnit: Unit
tracker-store.service not found. - indexing for (null) will not work
2016-10-15 20:32:12 +02:00
Alexander Ried 47dc33ded2 gnome3.evolution-data-server module: add self to systemd path 2016-10-15 20:32:12 +02:00
Alexander Ried 6457d1bbe3 gnome3.gnome-terminal-server: init module
since gnome3.22 gnome-terminal uses a systemd service for it's backend
server.
2016-10-15 20:32:12 +02:00
Graham Christensen fbadf2da23 Merge pull request #19498 from grahamc/hound
Initialize Hound package / module
2016-10-15 13:56:24 -04:00
Graham Christensen 6c7a605714
hound: init module 2016-10-15 13:54:59 -04:00
Alexander Ried d91365d714 audit module: only enable service if kernel has audit (#19569) 2016-10-15 16:03:41 +02:00
romildo 0efba3b99c qlipper: init at 2016-09-26 2016-10-15 07:46:12 -03:00
romildo 0f78fcec7a
screengrab: init at 2016-02-24
fixes #19561
2016-10-15 12:10:16 +02:00
Frederik Rietdijk cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Vladimír Čunát 727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00