Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix		2014-12-28 14:29:52 -05:00
..
autofs.nix	nfs-utils: align attrname with pkgname	2014-12-06 17:01:05 +01:00
cgminer.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
cpuminer-cryptonight.nix	cpuminer-cryptonight: new service module	2014-09-22 13:37:47 -04:00
defaultUnicornConfig.rb	nixos: Add gitlab and gitlab-shell	2014-12-12 18:01:29 +01:00
dictd.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
disnix.nix	disnix: bump versions and update module to use its latest features	2014-06-09 23:46:30 +02:00
docker-registry.nix	nixos: add docker-registry module	2014-11-22 12:16:41 +01:00
etcd.nix	nixos/etcd: fix postStart check and make tests deterministic	2014-11-23 12:16:50 +01:00
felix.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
folding-at-home.nix	Fix some uid/gid attributes to match the actual user/group name	2014-04-29 10:51:42 +02:00
gitlab.nix	gitlab: fix i686-linux build and module	2014-12-14 02:24:12 +01:00
gitolite.nix	enable different useraccount name for gitolite user	2014-11-14 17:39:41 +01:00
gpsd.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
mesos-master.nix	nixos/mesos: restart on failure	2014-12-01 16:57:56 +01:00
mesos-slave.nix	nixos/mesos: Parameterize mesos slave attributes	2014-12-18 14:47:24 -08:00
nix-daemon.nix	Use https://cache.nixos.org	2014-12-09 13:38:46 +01:00
nix-gc.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
nix-ssh-serve.nix	nix-ssh: Don't use a shell that refers to a store path	2014-07-25 14:29:08 +02:00
nixos-manual.nix	Fix opening NixOS manual	2014-08-27 11:08:50 +02:00
phd.nix	Fix forgotten unit entry	2014-09-03 15:47:53 +04:00
redmine.nix	redmine: fix use of bundler	2014-12-28 14:22:11 -05:00
rippled.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
rogue.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
siproxd.nix	siproxd: initial service expression	2014-08-19 10:19:52 -04:00
svnserve.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
synergy.nix	nixos/synergy: Fix use of the "optional" function.	2014-12-24 12:35:57 +01:00
uhub.nix	uhub: initial service expression	2014-09-01 10:53:19 +04:00
zookeeper.nix	make zookeeper.nix non-executable	2014-11-21 15:06:51 +01:00