mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity
62700 commits 297 branches 124 tags 6.3 GiB
Commit graph

2816 commits

Author SHA1 Message Date
rushmorem b5820a5ebd Update Marathon module 
The new module makes it possible to pass extra commandline
arguments to Marathon as well as environment variables.
 2015-05-21 15:45:13 +02:00
Arseniy Seroka 0b3e2becca Merge pull request #7829 from joamaki/vmware_guest 
VMWare guest support and open-vm-tools package
 2015-05-15 15:13:30 +03:00
Jussi Maki 6a0d21eb86 VMWare guest support and open-vm-tools package 2015-05-15 12:43:21 +02:00
Arseniy Seroka 946e7dca61 Merge pull request #7842 from dezgeg/pr-nix-serve 
nix-serve: Add nixos module
 2015-05-14 22:44:43 +03:00
Jascha Geerds 779b65f019 cups: Second attempt to fix our printing tests; add more sleep statements 2015-05-14 17:46:32 +02:00
lethalman 1103392dd9 Merge pull request #7794 from womfoo/kbdlight 
Add kbdlight package and setuid wrapper
 2015-05-14 17:09:28 +02:00
Tuomas Tynkkynen fd8cb1ff2d nix-serve: Add nixos module 
This allows sharing the Nix store of the machine as a binary cache
simply by setting 'services.nix-serve.enable = true'.
 2015-05-14 12:27:28 +03:00
Eelco Dolstra 15ffb9ad88 Remove fixed uid in tests 2015-05-13 16:23:57 +02:00
Eelco Dolstra fc8011ad8d Ensure that nscd, sshd are created as system users 
c0f70b4694 removed the fixed uid
assignment, but then it becomes necessary to set isSystemUser.

http://hydra.nixos.org/build/22182588
 2015-05-13 16:23:36 +02:00
Nikolay Amiantov e9679ce32a postgresql-backup: use system postgresql package 2015-05-13 16:06:50 +03:00
Jascha Geerds 92317259ef cups: First attempt to fix our printing tests; wait until cups is fully initialized 2015-05-13 14:22:30 +02:00
William A. Kennington III 2806491cc4 nixos/consul: Add shell for health checks 2015-05-11 17:44:07 -07:00
William A. Kennington III b6e26aa8df nixos/consul: Support a config directory for health checks 2015-05-11 16:45:04 -07:00
William A. Kennington III 1938dc9b54 nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options 2015-05-11 16:27:53 -07:00
Arseniy Seroka 26492cdba3 Merge pull request #7434 from Forkk/plex-media-server 
plex: add support for managing plugins via Nix
 2015-05-11 14:48:30 +03:00
Eelco Dolstra 492471b453 Apply some overrides to upstream systemd units 
This removes the need for the following patches:

9a6cade993
9f7e832c90
 2015-05-11 12:43:35 +02:00
Arseniy Seroka c0727fb751 Merge pull request #7788 from Lassulus/charybdis 
add charybdis nixos module
 2015-05-11 12:57:58 +03:00
lassulus 304cab2b46 add charybdis nixos module 2015-05-11 11:38:53 +02:00
Domen Kožar bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
Kranium Gikos Mendoza 6f634e3c3a Add kbdlight package and setuid wrapper 
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
 2015-05-11 13:23:01 +08:00
Ricardo M. Correia aa75bb25d8 grsecurity: Update stable and test patches 
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
 2015-05-11 02:45:38 +02:00
Charles Strahan ba186ec4b9 mesos service: only pass --zk if quorum > 0 
The ZooKeeper URL is not necessary when using in-memory slave
registration.
 2015-05-10 19:36:20 -04:00
Charles Strahan 760169663e mesos: fix indentation in service definition 2015-05-10 17:23:33 -04:00
Jascha Geerds 19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise"" 
This reverts commit 48e65cec4e.
 2015-05-10 20:47:50 +02:00
Jascha Geerds 652d06207d cups: Rename "browsing" config option to "advertise" 2015-05-10 13:46:32 +02:00
Jascha Geerds c4c0ec0581 cups: Add changelog for the upcoming NixOS release 2015-05-10 13:46:32 +02:00
Jascha Geerds 6f69dd46d7 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 13:46:32 +02:00
Jascha Geerds 65e2b83b36 cups: Fix printing tests 
It seems like there's an upstream bug in the "lpstat" command. We need
to specify the server's port.

Further information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711327

[root@client:~]# lpstat -H
/var/run/cups/cups.sock

[root@client:~]# lpstat -h server -H
/var/run/cups/cups.sock:631

[root@client:~]# CUPS_SERVER=server lpstat -H
server:631

[root@client:~]# lpstat -h server:631 -H
server:631
 2015-05-10 13:46:32 +02:00
Jascha Geerds f4d9c9043c cups: Remove deprecated config options from cupsd.conf 2015-05-10 13:46:32 +02:00
Jascha Geerds e9cf6cd34f cups: Use systemd files provided by CUPS 2015-05-10 13:46:32 +02:00
Jascha Geerds 48e65cec4e cups: Rename "browsing" config option to "advertise" 2015-05-10 12:41:21 +02:00
Jascha Geerds 116006702b cups: Add changelog for the upcoming NixOS release 2015-05-10 12:41:21 +02:00
Jascha Geerds 2cc8d15653 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 12:41:21 +02:00
Jascha Geerds 55a6469ba3 cups: Fix printing tests 
It seems like there's an upstream bug in the "lpstat" command. We need
to specify the server's port.

Further information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711327

[root@client:~]# lpstat -H
/var/run/cups/cups.sock

[root@client:~]# lpstat -h server -H
/var/run/cups/cups.sock:631

[root@client:~]# CUPS_SERVER=server lpstat -H
server:631

[root@client:~]# lpstat -h server:631 -H
server:631
 2015-05-10 12:41:21 +02:00
Jascha Geerds 3710dbec05 cups: Remove deprecated config options from cupsd.conf 2015-05-10 12:41:20 +02:00
Jascha Geerds 4ac95ab328 cups: Use systemd files provided by CUPS 2015-05-10 12:41:20 +02:00
Lluís Batlle i Rossell 21dd114f82 Revert "Making nixos keep a ref to its stdenv" 
This reverts commit d170c98d13.

niksnut argues that we need smaller system closures, not bigger.

So users facing the trouble of getting gcc rebuilds after nix-collect-garbage
for any minimal nixos configuration change should use other means of
not losing the stdenv output.

One way is to keep one somewhere: nix-build -A stdenv -o stdenv '<nixpkgs>'.
Another may be to use nix.conf options like gc-keep-outputs, gc-keep-derivations
or env-keep-derivations.
 2015-05-09 21:11:49 +00:00
Lluís Batlle i Rossell d170c98d13 Making nixos keep a ref to its stdenv 
This will help a lot on ARM, where nix-collect-garbage erases gcc; then, any
change to a small system config file requires rebuilding gcc again.

I don't know why it does not happen on x86. Maybe it just pulls the gcc from
hydra, if garbage is collected.
 2015-05-09 20:19:34 +00:00
Lluís Batlle i Rossell d8a2bb86c0 Raspberry Pi 2 changes to make it boot. 
It boots, but some things still don't work:
1) Installation of DTBs
2) Boot of initrd

Booting still needs a proper config.txt in /boot, which could probably be
managed by NixOS.
 2015-05-09 17:05:24 +00:00
William A. Kennington III c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
Rob Vermaas 650d3f8fc4 Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared. 
(cherry picked from commit ccf672ca6b)
 2015-05-07 08:51:38 +00:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Joachim Schiele 7aed6ddbb4 Merge pull request #7482 from qknight/mysql_socket_permissions 
/run/mysqld now 0755 (instead 0700)
 2015-05-07 01:55:00 +02:00
Joachim Schiele db79335c07 mysql: /run/mysql now 0755 (instead 0700) 
see https://github.com/NixOS/nixpkgs/pull/7482
 2015-05-07 01:51:05 +02:00
Pascal Wittmann 40b9e938b6 postfix service: description enhancement 
closes #7651
 2015-05-06 21:53:39 +02:00
Stephen Weinberg a6ebccfbb8 Sane default configuration for sabnzbd module 
Added option to set user. Use unpriviledged user by default. Add sane
default for configuration location.
 2015-05-05 00:18:22 -04:00
Aristid Breitkreuz 5ccbfb2dcc tarsnap: fix up permissions of existing cache directories 2015-05-04 18:58:35 +00:00
Eelco Dolstra 4239e276ea fetch-ec2-data: Don't restart 
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
 2015-05-04 16:56:46 +02:00
Eelco Dolstra 28e49dcb41 Style fix 2015-05-04 14:18:14 +02:00
Eelco Dolstra c2bf9c3ee3 Typo 2015-05-04 14:16:19 +02:00