mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 00:54:46 +00:00
Code Issues Wiki Activity
53333 commits 194 branches 125 tags 8.6 GiB
Commit graph

1606 commits

Author SHA1 Message Date
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
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
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Mathijs Kwik f356cee747 sudo: allow adding extra configuration options to the bottom of sudoers 
from sudoers (5):
When multiple entries match for a user, they are applied in order.
Where there are multiple matches, the last match is used (which is not necessarily the most specific match).
 2014-11-02 13:27:05 +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
Eelco Dolstra a9f5e77e2f update-users-groups.pl: Generate hashed passwords internally 
I.e. don't call "passwd" to update /etc/shadow from the "password"
option. This has the side-effect of not updating the password if
mutableUsers = true (since the code path for "hashedPassword" has a
check for mutableUsers).

Fixes #4747.
 2014-10-31 17:42:09 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Peter Simons e18e77fbcd Merge pull request #4746 from abbradar/synaptics-fingers 
Add "fingersMap" option to Synaptics
 2014-10-31 11:06:58 +01:00
Nikolay Amiantov 118096fc0b synaptics: add fingersMap option 2014-10-31 12:45:54 +03:00
Nikolay Amiantov 0eb86647b3 synaptics: add types to options 2014-10-31 12:45:54 +03:00
Aristid Breitkreuz 93f2c180d0 rsnapshot: add git version & make it configurable in the nixos module 2014-10-27 20:38:39 +01:00
Kirill Elagin 0c6d49da7d xsession: Start the right pulseaudio binary 
Fixes #4663.
 2014-10-27 15:43:19 +03:00
Rickard Nilsson e2ada42623 syslog-ng: Update from 3.5.6 to 3.6.1 
Also update the NixOS module, syslog-ng now automatically listens to
the systemd journal, so we don't have to set up syslog.socket.
 2014-10-27 12:22:22 +01:00
lethalman 40b5aa1d33 Merge pull request #4506 from cstrahan/logstash-config 
logstash service: make log verbosity configurable.
 2014-10-26 20:10:03 +01:00
William A. Kennington III 8636d93f54 Merge pull request #4213 from wkennington/master.zfsiso 
[Dont Merge] nixos-iso: Add zfs / btrfs to supportedFilesystems
 2014-10-25 18:01:17 -07:00
Aristid Breitkreuz dabdab8dce Merge pull request #4640 from lethalman/installer-icons 
kde installer: Add gparted, nixos manual and konsole in the desktop
 2014-10-25 16:32:56 +02:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
Luca Bruno 9e1ab43459 gnome3: Add cantarell fonts. Closes #4633 2014-10-24 11:50:47 +02:00
Luca Bruno e553e27f48 kde installer: Add gparted, nixos manual and konsole in the desktop 2014-10-23 18:59:25 +02:00
Vladimír Čunát 2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Domen Kožar 3b133beb7a Merge pull request #4553 from ehmry/polipo 
drop permission prestart from polipo service module
 2014-10-23 12:51:36 +02:00
Peter Simons 5986bb2199 Merge pull request #4631 from robberer/tmp1 
passwordFile: update description
 2014-10-23 11:36:30 +02:00
Luca Bruno 0927405a37 fontconfig: update 2.10.2 -> 2.11.1. Close #4410, #2050 2014-10-23 10:40:26 +02:00
Longrin Wischnewski a2c65d447f passwordFile: update description 2014-10-23 04:52:50 +02:00
Thomas Tuegel da77d9f409 Merge pull request #4614 from geerds/kde4-plasma-nm 
kde4: Use plasma-nm instead of knetworkmanager
 2014-10-22 20:28:36 -05:00
Aristid Breitkreuz 608aeede89 Merge pull request #4597 from ehmry/cjdns 
Cjdns
 2014-10-22 20:49:20 +02:00
Ricardo M. Correia 10348a0f2c grsecurity: Update documentation to mention correct kernels 2014-10-22 16:50:36 +02:00
Jascha Geerds 83ae3042a7 kde4: Use plasma-nm instead of knetworkmanager 2014-10-22 13:27:19 +02:00
aszlig 57aaf3d36e
Merge branch 'nixpart-1.0-preparations'. 
Partially and temporarily addresses NixOS/nixops#228.

We now have an up-to-date version of Blivet and a bunch of its dependen-
cies as well as the old nixpart 0.4 with all its old and crappy
dependencies, which should fix _simple_ partitioning layouts for NixOps.

Also, nixpart 1.0 is now marked as broken, because it is not yet
released and this branch is more of a preparation and "damage control"
in case I shouldn't manage to finish nixpart + nixos-assimilate in time
for the next NixOS release.
 2014-10-22 08:23:31 +02:00
aszlig 23160383e3
nixos: Add a filesystem module for JFS. 
I'm not using JFS, but this is to mainly make jfsutils available if you
have defined a JFS filesystem in your configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-10-22 08:22:57 +02:00
Emery Hemingway a3338abcfe cjdns: add peer hostnames to extraHosts, option for external config 2014-10-21 13:16:04 -04:00
Georges Dubus 50be0d5447 Removed the kde4_next nixos module 
Merged its differences into kde4. This commit fixes #4519.
 2014-10-21 14:04:28 +02:00
Domen Kožar 14631cec82 nixos: prosody was clashing with seeks unix ids 2014-10-20 17:22:01 +02:00
Jaka Hudoklin 594f354bc7 nixos/graphite: fix grahite api documentation url 2014-10-20 13:32:58 +02:00
Jaka Hudoklin 09c8d909fb nixos/graphite: update docs, add graphite pager 2014-10-20 13:27:21 +02:00
Eelco Dolstra a3b873924b Let the kernel load firmware directly 
Loading firmware via udevd is obsolete. Fixes #4552.
 2014-10-20 13:25:00 +02:00
William A. Kennington III f020a26164 nixos/systemd: Also escape \ characters 2014-10-19 16:34:53 -07:00
Vladimír Čunát 359dd3b8ac nixos: fix two pipefail problems 
It failed since 3c6efec2c0, i.e. #4453.
Now it should "work" the same as before.
 2014-10-19 19:29:28 +02:00
Domen Kožar 2fa662c957 systemd: replace @ when generating unit command name 2014-10-19 17:20:37 +02:00
Domen Kožar 0854836fd2 systemd: include name of the unit when generating nix store path 2014-10-19 15:49:55 +02:00
Aristid Breitkreuz bda39ae4de remove unused parameter from nixos module that is causing trouble with nixops 1.2 2014-10-19 14:10:28 +02:00
Jaka Hudoklin 988ed87e70 nixos/neo4j: add package option 2014-10-18 13:18:37 +02:00
Franz Pletz 2c321bf296 Add support for global LXC config files 2014-10-18 05:02:39 +02:00
Emery Hemingway 32d6ae7ed9 drop permission prestart from polipo service module 
chowning the cache directory can timeout the service, permissions
on this directory should never change without user intervention
 2014-10-16 10:57:16 -04:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Rickard Nilsson 135d677690 nixos/logrotate: Fix spelling mistake 2014-10-16 08:20:43 +02:00
Rickard Nilsson cdba59d0f2 nixos/syslog-ng: Add option configHeader 2014-10-16 08:14:45 +02:00
Rickard Nilsson 2ffe274486 nixos/logrotate: Specify type for config option 2014-10-15 16:52:50 +02:00
Mathnerd314 938f92e8b2 Fix the driver for qemu ("vesa" -> "modesetting") 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-10-15 12:24:50 +02:00
Domen Kožar bc015be0f3 fix eval 2014-10-15 12:00:20 +02:00
Lluís Batlle i Rossell f594033822 nixos nfs: allow setting the lockd ports. 
This helps in setting a fixed firewall open port for NFS lockd.

Based on:
http://rlworkman.net/howtos/NFS_Firewall_HOWTO

(cherry picked from commit b32ca0616ff70795f71995fa79ea508b82f30b3a)

Conflicts:
	nixos/modules/services/network-filesystems/nfsd.nix
 2014-10-15 10:59:33 +02:00
Joachim Schiele 13298fcbb9 Merge pull request #4535 from flosse/lua-bitop 
lua-packages: added lua-bitop to add websocket support for prosody
 2014-10-15 09:41:32 +02:00
William A. Kennington III 5118dcf4fb nixos-iso: Add zfs / btrfs to supportedFilesystems 2014-10-14 20:24:43 -07:00
Markus Kohlhase 5308d3284b prosody: added websocket support 2014-10-15 03:57:00 +02:00
Rickard Nilsson 54a0ac090c nixos/syslog-ng: Replace option serviceName with listenToJournal. Fix socket activation 2014-10-14 15:38:42 +02:00