alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
57234 commits 217 branches 121 tags 4.5 GiB
Commit graph

2294 commits

Author SHA1 Message Date
Peter Simons b7ecd5e729 Merge pull request #5025 from abbradar/xmonad-wrapper 
nixos/xmonad: make a wrapper
 2015-02-03 11:52:09 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Nikolay Amiantov b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Thomas Tuegel 0fee7a2b21 fontconfig: stringify dpi correctly 2015-02-01 16:18:48 -06:00
Bjørn Forsman ee52a61e3a nixos/tftpd: add option types and fixup descriptions 
The first description is a (incorrect) copy/paste from the 'vsftpd'
module, and the second option lacks a 'dot' at the end.
 2015-02-01 15:57:28 +01:00
lethalman 9576ff49d8 Merge pull request #5737 from matthiasbeyer/add-gitolite_admin_pubkey_oneline_note 
Add note that admin-pub-key for gitolite has to be written in one line
 2015-01-30 11:24:06 +01:00
lethalman 41cca7d2d6 Merge pull request #6045 from ragnard/apache-kafka 
apache-kafka: New package and service
 2015-01-30 10:50:14 +01:00
Luca Bruno a239775488 Merge PR #5772, boot.loader.timeout 2015-01-30 10:39:50 +01:00
Bob van der Linden a3d5f4f3ef nixos: gummiboot: change default to 1000 if boot.loader.timeout is null 
When gummiboot.timeout == null, the menu will still be skipped.
When gummiboot.timeout == 0, the menu will also be skipped.
The only way to show the menu 'indefinitely' is to show it a long time.
 2015-01-30 10:36:21 +01:00
Bob van der Linden f93ba51469 nixos: loader: added generic config.boot.loader.timeout option 
timeout options of grub and gummiboot will inherit the value of this
option by default.
 2015-01-30 09:53:44 +01:00
Shea Levy 52d4b9d982 Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs 2015-01-30 01:07:59 -05:00
Ragnar Dahlén 17bd96ea25 apache-kafka: New service for Apache Kafka 2015-01-29 11:10:22 +00:00
lethalman a15edc22e3 Merge pull request #5615 from nckx/freefall 
Add freefall: hard drive protection on HP/Dell laptops
 2015-01-28 18:52:46 +01:00
Eelco Dolstra 378006f0f2 Restrict the length of container names 2015-01-28 16:13:00 +01:00
Jaka Hudoklin c0eff1de61 Merge pull request #5939 from offlinehacker/nixos/containers/containers_in_containers 
nixos/containers: make containers in containers possible
 2015-01-28 16:07:17 +01:00
Jaka Hudoklin 2af3ff52c2 nixos/containers: make containers in containers possible 2015-01-28 16:06:44 +01:00
Tobias Geerinckx-Rice ff5eae075a Add freefall NixOS service module 2015-01-28 15:59:21 +01:00
Eelco Dolstra b61d4ac6a5 ntpd: Fork into the background 
With -n, ntpd will write log messages to both syslog and stderr, which
is ugly.
 2015-01-28 15:34:42 +01:00
Eelco Dolstra 53710c752a nixos-rebuild: Update fallback code to update Nix 2015-01-27 18:58:20 +01:00
Eelco Dolstra 6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Thomas Tuegel 63ec1a9677 add stable attrs for plasma5, kf5, and kdeApps 2015-01-26 21:01:07 -06:00
Thomas Tuegel a55543711e kde5: simplify package list 2015-01-26 21:01:06 -06:00
Thomas Tuegel 3a97ea592f kdm: install default backgrounds 2015-01-26 21:01:06 -06:00
Thomas Tuegel 726b80bc87 startkde: don't split script between NixOS module and package 2015-01-26 21:01:06 -06:00
Thomas Tuegel e7508b831f kde5: warn if enabled with kde4 2015-01-26 21:01:05 -06:00
Thomas Tuegel 16b54d19d3 kde5: rename plasma5 desktop module 2015-01-26 21:01:05 -06:00
Thomas Tuegel 5c52354ee8 add NixOS module for Plasma desktop 2015-01-26 21:00:38 -06:00
Thomas Tuegel 849647a3eb environment: set paths for Qt plugins and QML 2015-01-26 20:59:49 -06:00
Domen Kožar 9df1bdefef Merge pull request #5982 from robberer/pkgs/openldap 
openldap: add dataDir, use cfg.user and cfg.group to run slapd
 2015-01-26 10:33:57 +01:00
Domen Kožar c1ce67561d openldap: correct directory hint 2015-01-26 10:03:25 +01:00
Longrin Wischnewski a4af32eec3 openldap: add dataDir, use cfg.user and cfg.group to run slapd 2015-01-26 09:35:56 +01:00
aszlig eae32fb798
nixos/tests/chromium: Increase VM memory size. 
Chromium is quite memory hungry and we frequently get random crashes in
the tests, so let's set it to 1024 MB because new releases of Chromium
most probably won't consume *less* memory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-26 09:31:03 +01:00
aszlig d110f5adf7
nixos/gitlab: Fix evaluation. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-26 08:20:14 +01:00
Jaka Hudoklin 6e7d708bcc nixos/rabbitmq: fix module 2015-01-26 02:09:04 +01:00
Charles Strahan 61816b06e7 nixos: disable gitlab test for now 2015-01-25 16:29:37 -05:00
Charles Strahan 6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Domen Kožar 2daba83828 openldap: add example config 2015-01-25 21:15:29 +01:00
aszlig 6308cba3fa
nixos/manual: Re-add development section. 
I think this has been accidentally dropped by a099ca4, at least there is
no reason stated, why it shouldn't be included, so I'm bringing it back.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-25 20:12:06 +01:00
Edward Tjörnhammar 6bbec634a7 Merge pull request #5850 from edwtjo/kodi-plugins 
XBMC to Kodi migrations
 2015-01-24 14:17:14 +01:00
Domen Kožar cb7cd012df Merge pull request #5593 from abbradar/modprobe-fix 
modprobe: wrap all of kmod
 2015-01-24 07:11:16 +01:00
Domen Kožar fde45d217e Merge pull request #5531 from abbradar/tlp 
tlp: add package
 2015-01-24 07:10:48 +01:00
Nikolay Amiantov b7b3a0972d nixos/tlp: add service 2015-01-24 02:56:21 +03:00
Eelco Dolstra 11a0344e13 Merge pull request #5918 from robberer/openntpd 
openntpd: add extraConfig and extraOptions
 2015-01-23 16:43:15 +01:00
Longrin Wischnewski 4fa5d1f626 openntpd: add extraConfig and extraOptions 2015-01-23 16:15:20 +01:00
aszlig 127c928c23
nixos/rename: Fix merging multiple destinations. 
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.

We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-22 14:08:28 +01:00
wmertens 8780caadd4 Merge pull request #5499 from wizeman/u/zfs-dont-fsck 
nixos: When generating /etc/fstab, ZFS and NFS filesystems shouldn't be checked
 2015-01-22 12:09:22 +01:00
Charles Strahan 8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby 
Pleasant ruby
 2015-01-21 23:27:38 -05:00
Matej Cotman 3ed3977166 owncloud: make .htaccess available 2015-01-21 22:49:22 +01:00
Matej Cotman 7494bd389e apache-httpd: add owncloud 2015-01-21 22:49:22 +01:00
Matej Cotman 6630e3e4fe apache-httpd: add restartSec option 2015-01-21 22:49:22 +01:00