Shea Levy
ea9c8d6a13
Merge branch 'rippled' of git://github.com/ehmry/nixpkgs
...
rippled: initial pkg and module expressions
Had to change the rippled uid.
Conflicts:
nixos/modules/misc/ids.nix
2014-04-05 14:23:29 -04:00
Domen Kožar
13bef7f403
Merge pull request #2127 from lethalman/gnome3
...
Gnome3 session changes, gnome-control-center icons
2014-04-05 00:35:06 +02:00
Luca Bruno
671e346eb2
gnome3: add glib-networking gio modules
...
With glib-networking, epiphany and other gnome apps
can access https and other networking protocols.
2014-04-04 23:45:06 +02:00
Shea Levy
c6797b373f
Turn on user-controlled wpa-cli on the livecd
...
Fixes #1204
2014-04-04 17:05:57 -04:00
Eelco Dolstra
6905aa1cf4
Merge pull request #2095 from geo-kollias/master
...
Added MonetDB NixOS module.
2014-04-04 13:55:24 +02:00
Domen Kožar
f530ead0ba
syncthing: add preStart script to create dataDir
2014-04-04 10:46:30 +02:00
Matej Cotman
7df1ce5088
syncthing: new package and nixos module
2014-04-04 10:46:29 +02:00
Shea Levy
8b5c617237
Add fuse to env by default
...
Fixes #458
2014-04-03 21:36:13 -04:00
Domen Kožar
52fbaee8d7
solr: add extraJars option
2014-04-03 22:46:45 +02:00
Eelco Dolstra
6e086caa8a
xterm: Don't enable unless X11 is enabled
2014-04-03 20:44:57 +02:00
George Kollias
ec1acce4e9
fixed monetdb's gid to be the same with its id.
2014-04-01 20:41:37 +03:00
George Kollias
0ded8e6de3
Added MonetDB NixOS module.
2014-04-01 20:20:33 +03:00
Vladimír Čunát
6445ac90ad
Merge master into x-updates
2014-04-01 10:49:31 +02:00
Emery Hemingway
def448f127
rippled: added comment on commented out config options
2014-03-31 22:59:01 -04:00
Shea Levy
c37bbda4a3
Merge branch 'psql-fix' of git://github.com/proger/nixpkgs
...
postgresql: properly fix permissions issue by in postStart
2014-03-31 21:45:11 -04:00
aszlig
9d8a8126e9
systemd: Add support for path units.
...
This allows to define systemd.path(5) units, for example like this:
{
systemd = let
description = "Set Key Permissions for xyz.key";
in {
paths.set-key-perms = {
inherit description;
before = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
pathConfig.PathChanged = "/run/keys/xyz.key";
};
services.set-key-perms = {
inherit description;
serviceConfig.Type = "oneshot";
script = "chown myspecialkeyuser /run/keys/xyz.key";
};
};
}
The example here is actually useful in order to set permissions for the
NixOps keys target to ensure those permisisons aren't reset whenever the
key file is reuploaded.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-31 12:33:25 +02:00
Vladimir Kirillov
c66be6378d
postgresql: properly fix permissions issue by in postStart
...
as per postgresql manual, interactions with psql should be carried
out with the postgresql system user and postgresql db user by default.
ensure it happens in postStart.
2014-03-31 18:06:06 +08:00
Eelco Dolstra
5ba0d51f68
Fix VirtualBox image generation
...
http://hydra.nixos.org/build/9905410
2014-03-31 11:15:11 +02:00
Eelco Dolstra
c20383e756
Another fix to the installer tests
2014-03-31 11:10:56 +02:00
Eelco Dolstra
0469f92faf
Bring back mkOrder
2014-03-30 20:35:25 +02:00
Eelco Dolstra
0fdd641b21
Ensure that slim's theme applies to slimlock
2014-03-30 19:33:28 +02:00
Eelco Dolstra
075168ca81
nixos-hardware-scan: Detect QEMU
2014-03-30 17:27:18 +02:00
Eelco Dolstra
aaf01268ff
Revert "slim: remove duplicate code"
...
This reverts commit f7d5e83abb
. It
breaks the Firefox and Xfce tests:
in job ‘tests.firefox.x86_64-linux’:
cannot coerce a boolean to a string
in job ‘tests.xfce.x86_64-linux’:
infinite recursion encountered
2014-03-30 17:06:01 +02:00
Eelco Dolstra
1c192e1fea
Another attempt to fix the installer test
...
http://hydra.nixos.org/build/9904133
2014-03-30 16:53:23 +02:00
Emery Hemingway
6c77690b28
rippled: initial pkg and module expressions
...
rippled is the Ripple P2P payment network reference server
https://ripple.com
2014-03-29 15:31:37 -04:00
Shea Levy
ac68dc6dc6
Merge branch 'minecraft-server' of git://github.com/thoughtpolice/nixpkgs
...
nixpkgs: add Minecraft Server & a service module
2014-03-29 12:51:49 -04:00
Austin Seipp
1acca1c396
nixos: add minecraft-server service
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-29 05:31:27 -05:00
Jaka Hudoklin
227997d8ca
nixos/rabbitmq: rewrite
...
- rewrite from old jobs options to new services
- add simple test
- add dataDir option
2014-03-29 10:56:07 +01:00
Shea Levy
c23464672e
sloppy sloppy Shea
2014-03-29 05:28:37 -04:00
Shea Levy
38cc80f4d8
D'oh
2014-03-29 05:25:16 -04:00
Shea Levy
1aa5589eef
Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
...
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406
Conflicts due to minor upgrade in the mean time
Conflicts:
nixos/modules/virtualisation/virtualbox-guest.nix
pkgs/applications/virtualization/virtualbox/default.nix
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2014-03-29 00:23:54 -04:00
Shea Levy
63f97fe9db
Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
...
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy
a82ca6a7f9
Merge branch 'disable-acpid' of git://github.com/ambrop72/nixpkgs
...
power-management: Don't enable acpid.
2014-03-28 23:52:56 -04:00
Shea Levy
7cebcb995d
Merge branch 'cache.pcscd' of git://github.com/wkennington/nixpkgs
...
Update Smartcard Utils + Fix Daemon Expression
2014-03-28 23:45:00 -04:00
Shea Levy
701cb6b099
Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs
...
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
2014-03-28 23:39:01 -04:00
Eelco Dolstra
c704f6bb4e
VM tests: Run hwclock in the initrd
...
Needed for the installer tests, since otherwise mounting a filesystem
may fail as it has a last-mounted date in the future.
http://hydra.nixos.org/build/9846712
2014-03-28 16:52:08 +01:00
Vladimír Čunát
576e9289dd
Merge master into x-updates
2014-03-27 21:34:06 +01:00
Moritz Ulrich
02a30bea44
Fix services.udisks.enable.
...
Latest update to udisks in 344f2e65
broke it for me. Fix it by doing the
following:
- Add udisks.service to /etc/systemd/system (via systemd.packages)
- Fix path to udisks-daemon in udisks.service (libexec/ instead of lib/)
2014-03-25 16:52:45 +01:00
Jaka Hudoklin
70a4c7b1df
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
...
- Make dhcp work, use dhcpcd without udev in container
- Make login shell work, patch getty to not wait for /dev/tty0
- Make ssh work, sshd/pam do not start session
2014-03-24 23:59:50 +01:00
Vladimír Čunát
11492176d5
xorg: add "intel-testing" video driver, currently 2.99.911
2014-03-23 22:10:56 +01:00
William A. Kennington III
155dc472d8
pcscd: Convert to systemd + Fix config file
2014-03-21 17:52:24 -05:00
Domen Kožar
917498001f
almir: correctly set PYTHONPATH
2014-03-21 18:02:15 +01:00
Rob Vermaas
020d3b299c
Make the GCE image use 100G as disk size (maximum).
2014-03-21 15:18:03 +01:00
Rob Vermaas
af6c571a7e
Increase size of GCE image. Use disk.raw as name inside tar.gz, as this is compulsory.
2014-03-21 14:56:00 +01:00
Vladimír Čunát
1941168c3d
Merge branch master into x-updates (fix eval)
2014-03-21 13:46:56 +01:00
Rickard Nilsson
6a60fc3bdd
solr module: Activate JSP support in Winstone
...
Required by older versions of solr. The JSP support
in Winstone seems spotty, but at one point we'll switch
over to Jetty instead.
2014-03-21 12:04:52 +01:00
Vladimír Čunát
a245aeaef1
nixos ati: support glamor, disabled by default
...
This is from @ambrop72 #1969 .
2014-03-21 10:34:19 +01:00
Austin Seipp
6e415d2b58
nixos: add BitTorrent Sync service module
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-20 12:24:28 -05:00
Shea Levy
78e6d0143d
Add ngircd module
2014-03-19 22:04:35 -04:00
Shea Levy
78029b7b0f
Merge branch 'nixos/elasticsearch/elasticsearch_fix' of git://github.com/offlinehacker/nixpkgs
...
nixos/elasticsearch: Make port an integer, add dataDir option, make pure
2014-03-19 18:02:13 -04:00