Igor Pashev
2b91426920
Use lib instead of pkgs.lib
...
Usage of pkgs.lib may cause infinite recursion
2014-11-17 20:30:37 +03:00
Evgeny Egorochkin
599394162c
update obsolete startOn values
2014-11-16 17:04:54 +02:00
Evgeny Egorochkin
f151f4c816
KDE4: fix sound using the old gstreamer approach; the correct way would be to wrap each and every phonon client, or patch phonon's search path
2014-11-15 21:40:13 +02:00
Michael Raskin
ba77c90161
Revert "cups: update package"
...
This reverts commit aa548af5a5
.
2014-11-15 17:00:15 +03:00
Michael Raskin
d86c047f9c
Revert "cups-filters: add package"
...
This reverts commit f7ba33de56
.
2014-11-15 16:59:58 +03:00
Michael Raskin
a7c8d00b27
Merge pull request #4857 from abbradar/cups2
...
[WIP] Improve printing experience and update related packages
2014-11-15 15:18:35 +03:00
Luca Bruno
e8adc8b5ec
Drop GNOME 3.10
2014-11-14 22:46:37 +01:00
William A. Kennington III
826f5468ab
nixos/unifi: Remove old ROOT.war links before relinking
2014-11-14 11:45:38 -08:00
Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Nikolay Amiantov
f7ba33de56
cups-filters: add package
2014-11-14 13:51:26 +03:00
Nikolay Amiantov
aa548af5a5
cups: update package
2014-11-14 13:51:26 +03:00
William A. Kennington III
d0e15cc575
Merge pull request #4983 from bosu/fw-stop-fix
...
firewall: clear rpfilter on stop
2014-11-14 00:14:27 -08:00
Boris Sukholitko
53b24d0c95
firewall: clear rpfilter on stop
2014-11-14 09:07:18 +02:00
Moritz Ulrich
e884dc32c5
Add local-fs.target to minidlna.
...
Minidlna fails to start if it wants to access a filesystem which isn't
mounted (yet).
2014-11-12 23:20:47 +01:00
Michael Raskin
0d6306be4d
Merge pull request #4950 from joachifm/dnscrypt-proxy
...
dnscrypt-proxy service
2014-11-13 00:25:05 +03:00
Longrin Wischnewski
490232bd2e
apache-httpd: add mod_access_compat for compatibility with old httpd-22 configurations
2014-11-12 13:18:02 +01:00
Joachim Fasting
52f0553209
Add dnscrypt-proxy service
...
The dnscrypt-proxy service relays regular DNS queries to
a DNSCrypt enabled upstream resolver.
The traffic between the client and the upstream resolver is
encrypted and authenticated, which may mitigate the risk of
MITM attacks and third-party snooping (assuming a trustworthy
upstream).
Though dnscrypt-proxy can run as a standalone DNS client,
the recommended setup is to use it as a forwarder for a
caching DNS client.
To use dnscrypt-proxy as a forwarder for dnsmasq, do
```nix
{
# ...
networking.nameservers = [ "127.0.0.1" ];
networking.dhcpcd.extraConfig = "nohook resolv.conf";
services.dnscrypt-proxy.enable = true;
services.dnscrypt-proxy.localAddress = "127.0.0.1";
services.dnscrypt-proxy.port = 40;
services.dnsmasq.enable = true;
services.dnsmasq.extraConfig = ''
no-resolv
server=127.0.0.1#40
listen-address=127.0.0.1
'';
# ...
}
```
2014-11-11 22:47:19 +01:00
Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Michael Raskin
6d0518fbdf
Merge pull request #4282 from sztupi/crashplan
...
Crashplan
OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
2014-11-09 18:09:33 +03:00
Edward Tjörnhammar
c329e5bbd9
i2pd: added package, service
2014-11-09 09:55:35 +01:00
Emery Hemingway
67a2a58314
cjdns: service tweaks, new NixOS test
2014-11-08 23:39:02 +01:00
Nikolay Amiantov
aeaa96f7e4
xfce4-volumed: add package ( close #4628 )
2014-11-08 21:48:51 +01:00
Aristid Breitkreuz
8b949e5ff5
Merge pull request #4823 from abbradar/synaptics-fix
...
synaptics: fix tapButtons setting
2014-11-08 19:38:06 +01:00
Aristid Breitkreuz
8b50383c45
Merge pull request #4859 from abbradar/git-daemon
...
nixos/git-daemon: fix a bug and add 'user' and 'group' options
2014-11-08 19:33:24 +01:00
Domen Kožar
9ea81152cc
Merge pull request #4891 from pSub/prefer-xresources
...
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 19:32:46 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Pascal Wittmann
d6e87f1749
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 15:25:40 +01:00
Aristid Breitkreuz
cf4a976ced
quassel: make a proper systemd unit (also properly works in containers now)
2014-11-08 14:59:25 +01:00
Nikolay Amiantov
46b866cf63
nixos/git-daemon: fix 'exportAll' option
2014-11-07 15:50:01 +03:00
Nikolay Amiantov
af1d09879b
nixos/git-daemon: add 'user' and 'group' options
2014-11-07 15:49:45 +03:00
Nikolay Amiantov
4b2e43865a
nixos/git-daemon: add types
2014-11-07 15:49:03 +03:00
Rickard Nilsson
71f64ded06
Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""
...
This reverts commit 8e1072fd60
.
2014-11-06 21:59:04 +01:00
Rickard Nilsson
2b3c3d0e32
Fixes to Apache 2.4 configuration
2014-11-06 21:58:40 +01:00
Eelco Dolstra
b3eb981a95
apache-httpd: Make 2.4 the default
...
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Evgeny Egorochkin
85d23f5292
thermald needs dbus config files to run
2014-11-06 15:19:33 +02:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Jaka Hudoklin
d232390d5d
nixos/graphite: fix user creation
2014-11-04 19:38:24 +01:00
Ricardo M. Correia
98a59df81f
nixos/transmission: Start after local-fs.target
2014-11-04 18:40:13 +01:00
Nikolay Amiantov
5f84c785ff
synaptics: fix tapButtons setting
2014-11-04 06:20:10 +03:00
lethalman
636a4c00ca
Merge pull request #4801 from robberer/pkgs/zabbix-server
...
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Longrin Wischnewski
ce8e1a278b
zabbix-server: add extraConfig option
...
add types to options
2014-11-03 16:47:07 +01:00
William A. Kennington III
8e1072fd60
Revert "syslog-ng: Update from 3.5.6 to 3.6.1"
...
This reverts commit e2ada42623
.
2014-11-02 17:22:28 -08:00
Peter Simons
a9c53037fa
Merge remote-tracking branch 'origin/master' into staging.
2014-11-02 16:15:53 +01:00
Peter Simons
415f41bf68
nixos/modules/services/monitoring/graphite.nix: strip trailing whitespace
2014-11-02 12:40:00 +01:00
Peter Simons
96a7e65c37
nixos/modules/services/monitoring/graphite.nix: don't create graphite user unconditionally
...
I'm not sure what exactly this user is needed for, i.e. under what circumstances
it must exist or not, but creating it unconditionally seems like the wrong thing
to do. I complained to @offlinehacker about this on Github, but got no response
for a week or so. I'm disabling the extraUsers bit to put out the fire, and now
hope that someone who actually knows about Graphite implements a proper solution
later.
2014-11-02 12:34:16 +01:00
Nikolay Amiantov
5423f62373
gitolite: add dataDir
2014-11-02 02:24:41 +03:00
lethalman
f079cd1721
Merge pull request #4750 from abbradar/nix-maxcores
...
Add buildCores option to nix
2014-11-01 22:01:39 +01:00
Nikolay Amiantov
e8dace201f
nix-daemon: add maxCores option
2014-11-01 23:58:21 +03:00
William A. Kennington III
ba53392bce
nixos/nat: Fix override so that sysctls are properly preserved
2014-10-31 16:50:25 -07:00
Peter Simons
b11060d8db
Merge remote-tracking branch 'origin/master' into staging.
2014-10-31 11:14:24 +01:00