Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Brian McKenna
a6bacd4d81
Add "light" package and setuid wrapper
2014-11-09 19:45:43 -07: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
Luca Bruno
510fba95e8
nixos-rebuild: reload dbus before starting other units. Closes #4546
2014-11-08 19:40:28 +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
Rüdiger Sonderfeld
fa1cec1037
update-users-groups.pl: Use UTF-8 instead of latin1.
...
Perl seems to write the file in latin1 independent of the actual input
encoding. This can corrupt the "description" field of /etc/passwd. By
setting "binmode" to ":utf8" Perl can be forced to write UTF-8. Ideally
the program would simply read/write the fields by value without any
changes in encoding. However, assuming/enforcing UTF-8 is a lot better
than using an obsolete coding like latin1.
2014-11-08 19:25:17 +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
Luca Bruno
7885c2ed12
Revert "nixos: iso-image: use syslinux bootloader for USB booting support"
...
This reverts commit 455db168b3
.
2014-11-08 14:33:27 +01:00
Luca Bruno
e3611709d6
Revert "nixos: installation: make installation ISOs USB bootable"
...
This reverts commit b7f6a138b1
.
2014-11-08 14:33:27 +01:00
Jaka Hudoklin
53667c7b1a
Merge pull request #4870 from bosu/docker-proxy
...
docker: propagate nix.proxy into daemon environment
2014-11-08 13:06:56 +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
Boris Sukholitko
0d89afdedd
docker: propagate nix.proxy into daemon environment
2014-11-07 13:46:36 +02: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
Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Peter Simons
02c37c1027
Merge pull request #4838 from abbradar/ssmtp-root
...
Add 'root' option to ssmtp
2014-11-05 15:45:47 +01: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
Vladimír Čunát
c0e2aceef4
fontconfig: patch and document
2014-11-05 12:12:30 +01:00
Nikolay Amiantov
1b6f0ffb6e
ssmtp: add 'root' option
2014-11-05 02:47:59 +03:00
Nikolay Amiantov
292e07689a
ssmtp: add types to options
2014-11-05 02:42:48 +03: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
Eelco Dolstra
c7ee917197
Fix tests.runInMachine evaluation
2014-11-04 14:28:09 +01:00
aszlig
8e516de3e7
nixos: Fix priorities of initialHashedPassword.
...
Regression introduced in f496c3cbe4
.
Previously when we used security.initialRootPassword, the default
priority for this option was 1001, because it was a default value set by
the option itself.
With the mentioned commit, it is no longer an option default but a
mkDefault, which is priority 1000.
I'm setting this to 150 now, as test-instrumentation.nix is using this
for overriding other options and because I think it still makes it
possible to simple-override it, because if no priority is given, we get
priority 100.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-04 05:19:07 +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
Peter Simons
b5fed52c43
Merge pull request #4238 from wkennington/master.boost
...
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Longrin Wischnewski
ce8e1a278b
zabbix-server: add extraConfig option
...
add types to options
2014-11-03 16:47:07 +01:00
Eelco Dolstra
f496c3cbe4
Obsolete security.initialPassword
...
You can now set users.extraUsers.root.initialHashedPassword instead.
2014-11-03 12:36:56 +01:00
Eelco Dolstra
f8f787b800
Handle initialPassword and initialHashedPassword for !mutableUsers
...
In this case, they're equivalent to setting ‘password’ and
‘hashedPassword’ (since there is no distinction between an initial and
non-initial user account state).
2014-11-03 12:32:32 +01:00
Eelco Dolstra
3696536115
Handle removing a password if mutableUsers = false
2014-11-03 12:32:27 +01:00
Eelco Dolstra
1b53a3fcb7
Add initialPassword and initialHashedPassword options
...
These are like password and hashedPassword, except that they only
apply when the user is initially created.
2014-11-03 12:32:19 +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
William A. Kennington III
5ae216558f
jfsrec: Remove derivation
2014-11-02 17:22:27 -08:00
Bob van der Linden
b7f6a138b1
nixos: installation: make installation ISOs USB bootable
2014-11-02 17:35:16 +01:00
Bob van der Linden
455db168b3
nixos: iso-image: use syslinux bootloader for USB booting support
...
This changes the bootloader for iso generation from Grub to
syslinux. In addition this adds USB booting support, so that
"dd" can be used to burn the generated ISO to USB thumbdrives
instead of needing applications like UnetBootin.
2014-11-02 17:35:16 +01:00
lethalman
560fd3a5b7
Merge pull request #4742 from abbradar/bcache-stage1
...
Support bcache volumes in initrd
2014-11-02 17:29:38 +01:00
Nikolay Amiantov
775f381a9e
stage-1: add bcache support
...
This adds necessary udev rule into initrd to support autodetecting
bcache partitions in stage-1. It also fixes 'sh' path for the new
rule to work.
2014-11-02 19:03:50 +03:00
Luca Bruno
5d2b3ff8cf
nixos: increase allocated memory for gnome tests. Closes #4651
2014-11-02 16:33:10 +01:00