philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

2581 commits

Author SHA1 Message Date
Nikolay Amiantov 7c03829024 Merge pull request #7060 from abbradar/nm-l2tp 
Support L2TP in NetworkManager
 2015-03-30 23:05:42 +03:00
Edward Tjörnhammar 1092b9da48 Merge pull request #7066 from edwtjo/xbmc-pruning 
Remove XBMC expressions in favor of the Kodi ones
 2015-03-30 21:46:29 +02:00
Edward Tjörnhammar 1345a65765 Remove XBMC expressions in favor of the Kodi ones 2015-03-30 21:43:32 +02:00
lethalman f72b0c43f6 Merge pull request #6762 from lethalman/nixos-install 
nixos-install: support -j, --cores and --option. Closes #6755
 2015-03-30 18:06:53 +02:00
lethalman dc560b5b02 Merge pull request #7031 from cwoac/mediatomb 
Add MediaTomb service
 2015-03-30 17:49:46 +02:00
Luca Bruno eac32cf697 Revert "Merge pull request #7032 from flosse/change-option-names" 
This reverts commit c265aafb55, reversing
changes made to c9bbf2228f.

Breaks evaluation, see https://github.com/NixOS/nixpkgs/pull/7032#issuecomment-87641471
 2015-03-30 13:45:07 +02:00
lethalman c265aafb55 Merge pull request #7032 from flosse/change-option-names 
nixos: prosody service - rename 'enabled' to 'enable'
 2015-03-30 12:47:11 +02:00
lethalman 321b2e0439 Merge pull request #7073 from oxij/x11support-dbus 
dbus: rename useX11 option into x11Support, cleanup a bit
 2015-03-30 10:28:45 +02:00
William A. Kennington III 113c6c8f6a nixos/initrd: Do a lazy library copy in hopes to save some space for replaced binaries 2015-03-29 21:53:25 -07:00
William A. Kennington III 6b3cf366d7 nixos/initrd: Allow overriding of binaries 2015-03-29 21:26:39 -07:00
Jan Malakhovski 380ee53fff dbus: rename useX11 option into x11Support, cleanup a bit 2015-03-29 23:28:30 +00:00
William A. Kennington III ca149f2be0 nixos/mysql: All versions of mysql have mysqld in /bin 2015-03-29 13:30:05 -07:00
Vladimír Čunát 299da40f9f iso: make efi FS size adaptive, make deterministic 
Fixes #6795.
This was co-authored with @bobvanderlinden.

(cherry picked from commit e19ac248ae59fd327c32b1ae3e37792c22a7c7ac)
Signed-off-by: Domen Kožar <domen@dev.si>

Conflicts:
	nixos/modules/installer/cd-dvd/iso-image.nix
 2015-03-29 22:25:41 +02:00
William A. Kennington III 553105310a nixos/stage-1: Fix the initrd builder for shell scripts 2015-03-29 13:20:54 -07:00
Nikolay Amiantov 16f047a60f nixos/networkmanager: support l2tp 2015-03-29 13:09:02 +03:00
William A. Kennington III 9718561589 nixos/vfat: Readd fsck.reiserfs 2015-03-28 19:07:45 -07:00
William A. Kennington III c379847fda nixos/vfat: Readd fsck.vfat 2015-03-28 19:06:43 -07:00
William A. Kennington III 4868649f03 nixos/initrd: Generic library copying 2015-03-28 18:37:29 -07:00
Aristid Breitkreuz 1901f3fe77 fix initrd now that cryptsetup switched to libgcrypt 1.6 2015-03-28 23:59:19 +00:00
Arseniy Seroka a639c710ae Merge pull request #6968 from oxij/unquestionably-good 
Easy to check to be unquestionably good changes
 2015-03-28 13:16:13 +03:00
Markus Kohlhase 47aa6725e2 nixos: prosody service - rename virtualHosts option 'enabled' to 'enable' 2015-03-27 21:36:05 +00:00
Oliver Matthews 51b06c5865 Add MediaTomb service 2015-03-27 12:45:25 +01:00
Jaka Hudoklin d3c6d4175a Merge pull request #6940 from offlinehacker/pkgs/ripple-data-api/add 
Add ripple data api package and nixos service
 2015-03-26 20:04:51 +01:00
Jaka Hudoklin 75169aabc3 Add ripple data api package and nixos service 2015-03-26 20:02:39 +01:00
Jan Malakhovski 5c6d86540b nixos: use types.enum instead of ad-hoc check in sshd service 2015-03-26 12:43:42 +00:00
Jan Malakhovski dc4fa2da8a nixos: udev: build rules locally 2015-03-26 12:43:42 +00:00
Rob Vermaas cbb14299c9 GCE image: Remove some unnecessary lib prefixes. 2015-03-26 09:15:09 +00:00
Rob Vermaas 80202fbd25 GCE image: Add some recommended sysctl settings. Disable OS level firewall by default for GCE images (GCE provides external firewall). Disable passwordAuthentication. Related to issue #6991. 2015-03-26 09:09:40 +00:00
William A. Kennington III 9d9a393a4b Merge pull request #6919 from ehmry/cjdns 
cjdns: update pkg and fix nixos test
 2015-03-25 22:16:23 -07:00
William A. Kennington III 8b3c7af358 Merge pull request #6981 from layus/systemd-escape-colon 
nixos/systemd: Also escape ':' characters
 2015-03-25 15:33:21 -07:00
William A. Kennington III 86666893f0 nixos/microcode-amd: Update to early initrd loader 2015-03-25 14:44:36 -07:00
William A. Kennington III b4fedf5315 nixos/intel-microcode: Support early initrd ucode loading 2015-03-25 14:14:46 -07:00
William A. Kennington III f2655e4fa0 makeInitrd: Support prepending other initrds 2015-03-25 14:14:46 -07:00
Guillaume Maudoux 6ca7fb8f73 nixos/systemd: Also escape ':' characters 2015-03-25 22:11:35 +01:00
Jascha Geerds 164dbfff80 nixos/tests/printing: Fix CUPS service name (#6767) 2015-03-25 13:26:37 +01:00
Arseniy Seroka ff22e19fc4 Merge pull request #6893 from hrdinka/nsd-config-options 
nsd: Fix automatic config options
 2015-03-23 13:19:29 +03:00
Jaka Hudoklin 491c8f82b2 Merge pull request #6917 from offlinehacker/rippled/module/awesome 
rippled: expose more options, make compatible with new rippled version
 2015-03-22 23:13:48 +01:00
Jaka Hudoklin ad10db7617 Merge pull request #6882 from offlinehacker/nixos/fluentd 
Add fluentd package and module
 2015-03-21 22:37:48 +01:00
Jaka Hudoklin 916aab2927 Merge pull request #6875 from offlinehacker/nixos/cadvisor/fix 
nixos/cadvisor: fixes
 2015-03-21 22:36:11 +01:00
William Casarin ea2baa8abf spectrwm window manager 2015-03-21 11:02:44 -07:00
Emery Hemingway ba2074fc31 nixos/tests/cjdns: do not build cjdns at evaluation 
Putting hostnames in the cjdns configuration requires a utility
be present to convert public keys to ip addresses
 2015-03-21 10:17:48 -04:00
Jaka Hudoklin 4947bacd52 rippled: expose more options, make compatible with new rippled version 2015-03-21 12:52:06 +01:00
Edward Tjörnhammar 664592561d nixos: added aiccu service 2015-03-20 22:01:35 +01:00
Austin Seipp 3ff22a924f Merge pull request #6871 from joachifm/apparmor-fixups 
Apparmor fixups
 2015-03-20 15:36:42 -05:00
aszlig ea2fd84ecd
nixos/mpd: Fix creation of "mpd" group. 
The group is specified using a singleton list, so the loaOf merging is
done by iterating through the list items with imap, so it enumerates
every element and sets that as the default "name" attribute.

From lib/types:143:

name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";

So, people get groups like "unnamed-X.Y" instead of "mpd".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
Tested-by: devhell <"^"@regexmail.net>
 2015-03-20 20:58:13 +01:00
Eelco Dolstra 0461f35894 Rename scrubDrv -> hydraJob and make it more effective 
It now strictly evaluates all remaining attributes, preventing
unevaluated thunks that cannot be garbage-collected. It's also applied
to all jobs in Nixpkgs' release.nix.

This reduces hydra-eval-jobs' memory consumption on the 14.12
release-combined jobset from 5.1 GB to 2.0 GB.
 2015-03-20 19:46:18 +01:00
Jaka Hudoklin 89f41b90fa Merge pull request #6874 from offlinehacker/pkgs/kubernetes/update 
kubernetes: update to 0.12.1, fix module
 2015-03-20 11:22:48 +01:00
Ricardo M. Correia 4d2317e6eb nixos/zfs: Don't default to git version for kernels >= 3.19 
Stable version 0.6.3-1.3 works with kernels 3.19.x.
 2015-03-19 19:37:33 +01:00
Arseniy Seroka 9cfdeba324 Merge pull request #6611 from jagajaga/slurm 
Slurm module
 2015-03-19 21:06:49 +03:00
Christoph Hrdinka d3a2edb8ce nsd: Fix automatic config options 2015-03-19 12:10:55 +01:00