JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,786 Commits 2 Branches 0 Tags 13 GiB
793cf28cd5
Commit Graph

2644 Commits

Author SHA1 Message Date
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
Joachim Fasting
5cb2cee954 nixos: condition sysctl.kptr_restrict on features.grsecurity 
Conditioning `sysctl.kptr_restrict` on `features.grsecurity` supports
any grsecurity enabled kernel without having to enable the grsecurity
module.
 2015-03-29 00:42:58 +01: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
Bob van der Linden
58112832a7 nixos: iso-image: use label "EFIBOOT" for efi.img 2015-03-24 22:15:32 +01:00
Bob van der Linden
f0fd1c9bcf nixos: iso-image: use memtest86 params in syslinux 
See also #6593.
 2015-03-24 22:15:11 +01:00
Bob van der Linden
c57a912016 nixos: test: add tests for booting installation iso in various ways 2015-03-24 22:09:07 +01:00
Bob van der Linden
9ff9949896 nixos: iso-image: removed com32 entries from syslinux menu 
These entries result in incorrect entries when UNetbootin writes
the image to an USB disk.
 2015-03-24 22:09:06 +01:00
Bob van der Linden
af68f24003 nixos: iso-image: solve UNetbootin compatiblity 
There are a number of hidden restrictions on the syslinux
configuration file that come into play when UNetbootin
compatiblity is desired. With this commit these are documented.
 2015-03-24 22:08:52 +01:00
Bob van der Linden
a12ddc1964 nixos: iso-image: use generic boot-loader timeout 
Syslinux uses different values than grub for timeout.
It uses 1/10 seconds as its unit and it uses 0 to disable timeouts.

In response to PR #5772.
 2015-03-24 22:03:30 +01:00
Bob van der Linden
16a936be90 nixos: iso-image: filename escaping in xorriso 2015-03-24 22:01:51 +01:00
Bob van der Linden
8d092270d2 nixos: iso-image: use syslinux bootloader for USB booting support 
This changes the bootloader for iso generation from Grub to
syslinux. In addition this adds USB booting support, so that
"dd" can be used to burn the generated ISO to USB thumbdrives
instead of needing applications like UnetBootin.
 2015-03-24 22:01:04 +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
Jaka Hudoklin
1b99f0aeb6 Merge pull request #6873 from offlinehacker/pkgs/panamax/update 
panamax: update, fix module
 2015-03-19 09:18:48 +01:00
Arseniy Seroka
15f7afa6b4 Merge pull request #6885 from hrdinka/update-nsd 
nsd: Update from 4.1.0 -> 4.1.1
 2015-03-19 03:15:35 +03:00
Jaka Hudoklin
fca0aa7077 Add fluentd package and module 2015-03-18 21:18:47 +01:00
Rickard Nilsson
bdbdaee3c0 scollector module: Add extraOpts option 2015-03-18 21:16:31 +01:00
Christoph Hrdinka
6db8155e37 nsd: Update from 4.1.0 -> 4.1.1 2015-03-18 21:01:35 +01:00
Luca Bruno
b94b08488f nixos/pulseaudio: don't put 32bit libs in systemPackages 
Fixes the useless collisions in the system path.
The 64bit and 32bit variants have the same files, hence
it's pointless to put the 32bit pulseaudio in systemPackages.
 2015-03-18 14:10:02 +00:00
Luca Bruno
cb45b7ec3e Revert "nixos: Multiple service instances, apply to nginx. See #6784" 
This reverts commit 7ef59c4fe2.

Wrong push! Sorry!
 2015-03-18 14:09:24 +00:00
Luca Bruno
7ef59c4fe2 nixos: Multiple service instances, apply to nginx. See #6784 2015-03-18 14:07:29 +00:00
Jaka Hudoklin
2482b75eae kubernetes: update to 0.12.1, fix module 2015-03-18 14:37:03 +01:00
Jaka Hudoklin
079520ced5 panamax: update, fix module 2015-03-18 14:35:24 +01:00
Jaka Hudoklin
536694bcd4 nixos/cadvisor: fixes 
- run as non root user, because of docker
- run docker by default
 2015-03-18 14:31:08 +01:00
Joachim Fasting
532337d673 Cleanup AppArmor module 
Remove excessive whitespace & comment sections
 2015-03-18 12:07:43 +01:00
Eelco Dolstra
224d0d5302 Set stricter permissions on /nix/store 
The nixbld group doesn't need read permission, it only needs write and
execute permission.

(cherry picked from commit 066758758e7c0768ff8da51d208cdae0f33b368c)
 2015-03-18 10:58:08 +01:00
lethalman
cdbeb7143c Merge pull request #6832 from k0ral/icecast 
Added icecast module
 2015-03-17 16:43:02 +01:00
koral
54857abfc9 Added icecast module. 2015-03-17 14:21:57 +00:00
lethalman
c91ccb4b9c Merge pull request #6842 from philandstuff/hash-owncloud-admin-password 
owncloud: don't store plaintext adminPassword in nix store
 2015-03-17 12:59:58 +01:00
lethalman
70b059fb59 Merge pull request #5936 from j-keck/nixos-container-usage 
nixos-container: add missing 'nixos-container update' in usage
 2015-03-17 12:43:29 +01:00
lethalman
359bc60ec8 Merge pull request #6448 from eduarrrd/ddclient 
ddclient module: fix module
 2015-03-17 12:38:12 +01:00
Philip Potter
7ad6dac43b owncloud: don't store plaintext adminPassword in nix store 
Rather than using openssl to hash the password at build time, and hence
leaving the plaintext password world-readable in the nix store, we can
instead hash the password in the nix expression itself using
builtins.hashString.
 2015-03-16 22:42:22 +00:00
Peter Simons
56bb114905 Merge pull request #6722 from joachifm/fix-id-mismatches 
Fix id mismatches
 2015-03-16 18:46:38 +01:00
Joachim Fasting
3518b761ba TCSD: use tss user/group instead of nginx 
For some reason TCSD is configured to use the nginx uid/gid.
Use the newly created tss uid/gid instead.
 2015-03-16 09:58:16 +01:00
Joachim Fasting
e9cd877921 nixos: resolve uid/gid conflicts 
This patch resolves all uid/gid conflicts except for nobody/nogroup (seems
to make sense that these are the same).
All conflicts where determined mechanically, but resolutions were manual.
This patch also marks uids/gids with no corresponding group/user as "unused"
(aka. reserved).

Briefly,

- tss group conflicts with dhcpcd
  The tss group id conflicts with dhcpcd: assign
  a new number and add a corresponding tss user.
- elasticsearch uid conflicts with haproxy gid
- resolve firebird/munin conflict
- fix fourstorehttp{,d} typo
- fix ghostOne typo: the service module refers to gids.ghostone, so use that
  in ids
- memcached uid conflicts with users gid
- nagios uid conflicts with disks gid
- nscd uid conflicts with wheel gid
- ntp uid conflicts with tty gid
- resolve postfix/postdrop id uid
- redis uid conflicts with keys gid
- sshd uid conflicts with kmem gid
- tcryptd uid conflicts with openldap gid
- unifi uid conflicts with docker gid
- uptimed uid conflicts with utmp gid
- zope2 uid conflicts with connman gid
- tomcat uid/gid mismatch
 2015-03-16 09:58:13 +01:00
Austin Seipp
ef95600372 Merge pull request #6771 from joachifm/apparmor-2.9 
Apparmor 2.9
 2015-03-15 14:16:24 -05:00
Nicolas B. Pierron
05e8a48fb4 Document and rename internal option of modules. 2015-03-15 14:45:42 +01:00
Ricardo M. Correia
7c8247a8c5 grsecurity: Update stable and test patches 
stable: 3.1-3.14.35-201503071140 -> 3.1-3.14.35-201503092203
test:   3.1-3.18.9-201503071142  -> 3.1-3.19.1-201503122205
 2015-03-15 03:49:58 +01:00
William A. Kennington III
c200c1e0a1 Merge pull request #6813 from globin/fix/elantech-trackpoint-scrolling 
Add Elanthec PS/2 Trackpoint (Thinkpad L430)
 2015-03-14 17:01:13 -07:00
Robin Gloster
a8a350e679 Add Elanthec PS/2 Trackpoint (Thinkpad L430) 2015-03-15 00:09:04 +01:00
koral
9c4cbaa553 Fix mpd configuration (enclosing quotes needed). 2015-03-14 12:15:34 +00:00
lethalman
f72d1abb79 Merge pull request #5846 from arno01/nginx 
nginx service improvements
 2015-03-13 11:41:27 +01:00
Nicolas B. Pierron
9f2865515d Fix infinite loop in fontconfig-ultimate.nix 
With the new evaluation of arguments, pkgs is now defined by the
configuration, which implies that option declaration with pkgs.lib
will cause an infinite loop.
 2015-03-12 23:42:58 +01:00
Shea Levy
3177d37652 Fix import using module args 2015-03-12 23:42:57 +01:00
Shea Levy
f69ce50529 Move most extra args out of eval-config.nix 2015-03-12 23:42:57 +01:00
Shea Levy
0a0a29fd0b Add comments about the module system interface 
Ideally the module system could be configured pretty much completely by
the contents of the modules themselves, so add comments about avoiding
complicating it further and possibly removing now-redundant
configurability from the existing interface.
 2015-03-12 23:42:57 +01:00
Shea Levy
e3eff53037 evalModules: Add internal option for the check argument 2015-03-12 23:42:57 +01:00
Shea Levy
e4a06f35b1 nixos: Don't evaluate twice to get the value of config.nixpkgs 2015-03-12 23:42:57 +01:00
Shea Levy
1d62ad4746 modules.nix: Generate the extra argument set from the configuration 
This allows for module arguments to be handled modularly, in particular
allowing the nixpkgs module to handle the nixpkgs import internally.
This creates the __internal option namespace, which should only be added
to by the module system itself.
 2015-03-12 23:42:57 +01:00
Vladimír Čunát
208d1f24db xfce: more update fallout 
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
 2015-03-12 23:02:15 +01:00
lethalman
14ed261fc7 Merge pull request #6765 from gebner/ibus-plugins 
Add ibus-qt and ibus-anthy.
 2015-03-12 14:35:23 +01:00
Joachim Fasting
7a9a24a95e Update AppArmor service module 
- Use AppArmor 2.9
- Enable PAM support
 2015-03-12 11:49:05 +01:00
Kirill Elagin
356810b178 cupsd: rename cupsd.service to cups.service 2015-03-12 09:00:56 +03:00
Gabriel Ebner
d23ed364b5 Add ibus-qt. 2015-03-11 21:54:04 +01:00
Gabriel Ebner
59da79c733 ibus: Enable XIM support. 
This allows firefox to use ibus.
 2015-03-11 21:54:04 +01:00
Gabriel Ebner
f222abea44 Add programs.ibus config option to enable ibus and plugins. 2015-03-11 21:53:34 +01:00
Thomas Tuegel
61cf7e1265 Merge branch 'kde5' 2015-03-11 11:49:45 -05:00
Thomas Tuegel
f370af91ad kde5: use ksshaskpass for SSH_ASKPASS 2015-03-11 11:49:29 -05:00