JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,295 Commits 2 Branches 0 Tags 13 GiB
2ae4c0aa69
Commit Graph

3237 Commits

Author SHA1 Message Date
Eelco Dolstra
fd06533def nixos-install: Don't barf if btrfs is missing 2015-07-13 17:55:49 +02:00
Eelco Dolstra
7b38cb699d services.openssh.knownHosts.*.publicKey: Update description and add example 
Note that it's no longer allowed to have multiple public keys
separated by a newline.
 2015-07-13 16:21:57 +02:00
tv
baab714b2e charybdis service: fix preStart script 2015-07-13 15:11:18 +02:00
lethalman
07056e8ee3 Merge pull request #8163 from qknight/added_meta_to_tests 
nearly all tests: added meta section
 2015-07-13 13:56:24 +02:00
Joachim Schiele
0731489953 all tests: added meta.maintainers section 2015-07-12 12:29:51 +02:00
Leroy Hopson
2e49828d9c firefox sync-server service: make path to paster executable absolute 
The systemd service was ignoring ExecStart because the path to the
paster executable was not absolute. Because ExecStart was ignored, the
service would not start.
 2015-07-12 20:43:52 +12:00
James Cook
a456168e5b Merge pull request #6702 from joachifm/dnscrypt-proxy 
nixos: some improvements for dnscrypt-proxy
 2015-07-12 00:17:46 -07:00
Eelco Dolstra
dc62669335 Set ‘allowSubstitutes = false’ on various derivations 
This reduces the number of binary cache requests. See
b64988bb35.
 2015-07-09 15:10:37 +02:00
William A. Kennington III
26e44a0a5c tests/boot: Remove unused store contents 2015-07-08 16:23:42 -07:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
William A. Kennington III
e861889e99 nixos/tests/installer: Add a testcase for fat32 /boot 2015-07-08 12:05:31 -07:00
Pascal Wittmann
1e4483b1ec nixos/bitlbee: fixed protocols option 2015-07-08 19:30:20 +02:00
Pascal Wittmann
c0de3b306b nixos/bitlbee: add hostname, config dir and protocols options 2015-07-08 19:14:36 +02:00
Jaka Hudoklin
95369cd831 Merge pull request #8679 from offlinehacker/kubernetes/fixes3 
nixos/kubernetes: fix cadvisor, kubelet autoregistration
 2015-07-08 12:16:18 +02:00
Arseniy Seroka
7e7371fe3c Merge pull request #8639 from sjmackenzie/zerotierone 
zerotier-one: service add
 2015-07-08 02:15:14 +03:00
laMudri
0f63a624f7 synaptics: fix to allow for more scrolling choices 2015-07-07 20:56:13 +01:00
William A. Kennington III
08ff83eab3 nixos/btrfs: Fix parsing of btrfs subvolume show with btrfsprogs 4.1 2015-07-07 11:34:50 -07:00
Eelco Dolstra
9fa19cfcea apache-httpd: Don't set default content encodings 
In general, you don't want a .tar.gz file to be served with
"Content-Encoding: x-gzip", because this causes browsers (like Chrome
or "curl --compressed") to decompress the file on the fly. So you end
up with a .tar rather than .tar.gz file, which is unexpected.

If people want such encodings, they should set them in their own NixOS
configuration.
 2015-07-07 12:12:49 +02:00
Jaka Hudoklin
5aefc44da9 nixos/kubernetes: fix cadvisor, kubelet autoregistration 2015-07-07 11:34:33 +02:00
Simon Vandel Sillesen
e85dac137e sundtek init at 30-06-2015 2015-07-07 10:58:58 +02:00
Luca Bruno
41cf8be412 nixos nix-daemon: lower priority is 19. Closes #8675 2015-07-07 09:49:05 +02:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Stewart Mackenzie
5297371b95 zerotier-one: service add 2015-07-07 07:11:44 +08:00
Arseniy Seroka
4f2b22aff0 Merge pull request #8629 from telotortium/subsonic 
subsonic: init at 5.2.1
 2015-07-07 01:09:19 +03:00
William A. Kennington III
bffc5789d5 Merge pull request #8656 from devhell/udisks2.service 
udisks2 service: Fix ExecStart path
 2015-07-06 01:11:53 -07:00
William A. Kennington III
b35da0edee Merge branch 'master.upstream' into staging.upstream 2015-07-05 19:35:50 -07:00
William A. Kennington III
4b836fb680 nixos/installer: Add grub2_efi to the store so that it is available to install 2015-07-05 19:11:56 -07:00
William A. Kennington III
fbfdc139d6 Merge branch 'master.upstream' into staging.upstream 2015-07-05 18:36:16 -07:00
William A. Kennington III
cb343e7be6 nixos/install-grub: Fix symlink installation for boot filesystems which don't support symlinking 
Some filesystems like fat32 don't support symlinking and need to be
supported on /boot as an efi system partition. Instead of creating the symlink directly in boot, create the symlink in
a temporary directory which has to support symlinking.
 2015-07-05 18:34:47 -07:00
Robert Irelan
f64a5dd3f3 subsonic service: init 
Add a systemd service and UID/GID for the Subsonic personal media
streamer server (<http://subsonic.org>).
 2015-07-05 17:25:42 -07:00
William A. Kennington III
c61d048427 nixos/quassel: Temporarily switch back to qt4 since qt5 tls in quassel is broken 2015-07-05 16:53:42 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Thomas Strobel
4ee2d39fbf grub installation: fix: simplify code 2015-07-05 21:55:56 +02:00
devhell
6befeb6818 udisks2 service: Fix ExecStart path 
It seems that with the latest update to `udisks2`, the ExecStart path
for the daemon changed from `/lib/udisks2` to `/libexec/udisks2`. This
commit reflects that change for our purposes.
 2015-07-05 19:36:26 +01:00
William A. Kennington III
c38a9b607f Merge pull request #8654 from ts468/upstream.trusted_grub_integration 
grub installation: integrate trustedGRUB + fix broken equality check
 2015-07-05 11:34:00 -07:00
Thomas Strobel
65cbbc75b0 grub installation: integrate trustedGRUB + fix broken equality check 2015-07-05 19:51:53 +02:00
Luca Bruno
6c8e6aaa24 nixos docker: fix service and test 2015-07-05 13:57:23 +02:00
lethalman
d7869f46ca Merge pull request #8602 from ts468/upstream.pam 
Security: integrate pam_mount into PAM of NixOS
 2015-07-05 00:40:49 +02:00
Thomas Strobel
7b6f279142 pam_mount module: integrate pam_mount into PAM of NixOS 2015-07-04 23:42:31 +02:00
Mateusz Kowalczyk
2bd811155e Merge pull request #8603 from ts468/upstream.xen 
Xen related stuff
 2015-07-04 16:13:33 +01:00
lethalman
07bdaa97da Merge pull request #8554 from dwe11er/luks-detached-header 
allow for using LUKS devices with detached header
 2015-07-04 13:17:54 +02:00
Arseniy Seroka
b15df9482a Merge pull request #8573 from lihop/shellinabox-service 
shellinabox service: initial implementation
 2015-07-04 14:02:06 +03:00
Arseniy Seroka
093a8994f9 Merge pull request #8624 from ambrop72/minidlna-update 
minidlna 1.1.4
 2015-07-04 13:59:32 +03:00
Leroy Hopson
1eb50ebbf2 shellinabox service: intial implementation 2015-07-04 21:18:13 +12:00
Pascal Wittmann
2fd9d56f51 nixos/skydns: fixed reference to skydns 2015-07-04 09:43:28 +02:00
Ambroz Bizjak
42a5ad5c5e minidlna: 1.0.25 -> 1.1.4 
Changes:
- gettext is needed to build
- Switched to using non-legacy ffmpeg.
- Removed ffmpeg stuff from include path since it causes build errors related to
a time.h header.
- Removed unneeded patch.
- Adjusted NixOS service due to the binary being renamed.
 2015-07-04 09:16:28 +02:00
aszlig
9bc2f77daa
nixos/tests/chromium: Improve sandbox checking. 
We no longer need have "SUID sandbox" enabled in the chrome://sandbox
status page and we now also check for "You are adequately sandboxed." to
be absolutely sure that we're running with proper sandboxing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-07-04 02:31:45 +02:00
Joachim Schiele
11cd596aea wordpress: language downloads are now reproducible 2015-07-03 13:06:44 +02:00
Thomas Strobel
8f911263e9 Xen Dom0: add dnsmasq to xen-bridge. 2015-07-02 16:27:40 +02:00
William A. Kennington III
b21fd5d066 nixos/postgresql: Fix initdb for existing, empty postgres partitions 2015-07-02 00:08:02 -07:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
dd9530c819 Merge remote-tracking branch 'projectorhq/riemann-tools' 
Add riemann-tools package and service
 2015-07-01 08:45:33 -04:00
Eelco Dolstra
f667310c06 Use mkAfter for services.postgresql.authentication 
Authentication methods are tried in order, so if another NixOS module
defines a specific ident mapping like

  local hydra all ident map=hydra-users

it should appear before the generic

  local all all ident
 2015-07-01 13:49:02 +02:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Tobias Geerinckx-Rice
013f88ac7e nixos: gnome-keyring: fix module description 2015-07-01 02:22:27 +02:00
Robert Pitts and Trenton Strong
bbb36ea039 Add riemann-tools to nixpkgs 
Adds package via bundlerEnv and service for Riemann health.
 2015-06-30 17:16:51 -04:00
Eelco Dolstra
96b325b0b7 Remove option ec2.metadata 2015-06-30 17:25:56 +02:00
Eelco Dolstra
32b9ca3219 EC2: Don't blackhole 169.254.169.254 
https://github.com/NixOS/nixops/issues/267
 2015-06-30 17:04:19 +02:00
Eelco Dolstra
a9b3d75e9e nix.buildMachines: Fewer required fields 2015-06-30 00:51:07 +02:00
Marcin Falkiewicz
c1becad3eb nixos/modules/system/boot/luksroot.nix: allow for LUKS devices with detached header 2015-06-29 17:36:47 +02:00
aszlig
f9bd72f24c
nixos/iso-image: Allow to customize menu label. 
It comes in handy to alter the menu label if you're not building a NixOS
installer image but for example if you want to build a live system and
still want to re-use the iso-image.nix module.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-06-28 23:30:17 +02:00
Edward Tjörnhammar
ed9dc1fd9e nixos: added gitit service 2015-06-28 12:39:52 +02:00
William A. Kennington III
b6322e1215 krb5: Break out into a lib and not lib version 2015-06-26 22:05:47 -07:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
William A. Kennington III
fee9ef8659 nixos: Replace pkgs.openssh with config.programs.ssh.package 2015-06-26 17:09:58 -07:00
Eelco Dolstra
1f3f31b2a8 Add options nix.{trustedUsers,allowedUsers} 
These are just trusted-users and allowed-users in nix.conf. It's
useful to have options for them so that different modules can specify
trusted/allowed users.
 2015-06-26 18:45:27 +02:00
Eelco Dolstra
fb203a34c0 nix.buildMachines: Don't require sshUser 2015-06-26 18:44:44 +02:00
Peter Simons
449c14d20b Merge pull request #8520 from hrdinka/fix/postfix-recipient_delimiter 
postfix: fix recipient_delimiter option
 2015-06-26 14:18:58 +02:00
Christoph Hrdinka
6839ad653a postfix: fix recipient_delimiter option 
This reverts commit 88f4b75a00 and fixes the
recipientDelimiter config option. Till then the camel case variant was used
while recipient_delimiter would have been right.
 2015-06-26 14:05:53 +02:00
Damien Cassou
ffe164d758 Merge pull request #8484 from DamienCassou/fix-blocking-stumpwm-module 
Don't block the system after starting stumpwm
 2015-06-26 11:40:59 +02:00
Damien Cassou
0bd3737bd0 stumpwm: don't block after starting stumpwm 
This is important to let nixos configure everything, e.g., a desktop
manager.
 2015-06-26 11:38:04 +02:00
Joachim Schiele
011993c86a wordpress: usability updates 2015-06-25 16:21:14 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Thomas Tuegel
0aa8e64967 kde5: JSON manifest format 2015-06-25 09:03:40 -05:00
Rok Garbas
d405d036c5 redmine service: fixing a typo, pointing to bundler package 2015-06-25 15:24:57 +02:00
Russell O'Connor
46f06ccde7 uwsgi-service: Add user/group for uwsgi service. 
Also add a uwsgi directory under /run (defaulting to /run/uwsgi) where the uwsgi user can place sockets.
 2015-06-24 14:48:53 +00:00
Simon Vandel Sillesen
9dab1a840c tvheadend: init at 4.0.4 2015-06-24 13:22:09 +00:00
William A. Kennington III
6532863ac4 unifi: 3.2.10 -> 4.6.3 2015-06-23 10:09:44 -07:00
Arseniy Seroka
266531b5b0 Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron 
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
 2015-06-23 18:54:22 +03:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Luca Bruno
f00440fac5 nixos/x11: start session with dbus-launch 
This is needed by most window managers. Desktop environments
usually launch dbus-launch if a session hasn't been started yet
so this shouldn't hurt. The worst it can happen is that one
dbus session will be unused in case it's started twice.

The GDM change is backported from recent gdm.
 2015-06-22 16:12:20 +00:00
Peter Simons
88f4b75a00 nixos: recipientDelimiter is no longer a valid configuration option in Postfix 2.11.x or later 
Note that this change in Postfix might affect the mlmmj.nix service in
ways I don't fully understand.
 2015-06-22 12:47:23 +02:00
Peter Simons
e08074ff6d nixos: fix code that sets up /etc/postfix 
The sample config files have moved from ${postfix}/share to ${postfix}/etc in
version 2.11.4.
 2015-06-22 12:47:23 +02:00
Arseniy Seroka
cf44a27fc4 fix argument in mkEnableOption 2015-06-21 18:21:21 +03:00
Travis B. Hartwell
caa216b640 atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2 
Added systemd to buildEnv path because of new libudev dependency.
 2015-06-19 15:32:12 -06:00
Damien Cassou
90912f8aa5 Merge pull request #8401 from DamienCassou/document-desktopManagerHandlesLidAndPower-in-systemd 
Explanation to desktopManagerHandlesLidAndPower
 2015-06-19 14:02:04 +02:00
Damien Cassou
26e424a4aa Explanation to desktopManagerHandlesLidAndPower 
With this patch, systemd-inhibit outputs a descriptive message when
desktopManagerHandlesLidAndPower=true (the default).

Before the patch:

    $ systemd-inhibit
         Who: /nix/store/[...]-xsession [...] (UID 1000/cassou, PID 18561/systemd-inhibit)
        What: handle-power-key:handle-lid-switch
         Why: Unknown reason
        Mode: block

After the patch:

    $ systemd-inhibit
         Who: /nix/store/[...]-xsession [...] (UID 1000/cassou, PID 18561/systemd-inhibit)
        What: handle-power-key:handle-lid-switch
         Why: See NixOS configuration option 'services.xserver.displayManager.desktopManagerHandlesLidAndPower' for more information.
        Mode: block
 2015-06-19 11:16:32 +02:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
William A. Kennington III
295846a254 nixos/nix-serve: Run as a separate user and add a signing key parameter 2015-06-17 19:10:39 -07:00
William A. Kennington III
8e19ac8d7c Merge branch 'master.upstream' into staging.upstream 2015-06-17 11:57:40 -07:00
William A. Kennington III
d4fc2b4d99 nixos/install-grub: Fix grub1 installation 2015-06-17 11:47:36 -07:00
rushmorem
d9c56c696f Replaces https://github.com/NixOS/nixpkgs/pull/8368 2015-06-17 19:26:17 +02:00
Rushmore Mushambi
8170e74d9f Revert "Make it possible to boot NixOS from a SCSI Disk on KVM" 2015-06-17 19:13:08 +02:00
rushmorem
ee3768b9ba Make it possible to boot NixOS from a SCSI Disk on KVM 
Currently NixOS can't boot from a SCSI disk as a KVM Guest.
I found this out while installing it on the new [Linode KVM
platform](https://www.linode.com/docs/platform/kvm#custom-kernel-configuration).
 2015-06-17 17:28:07 +02:00
Eelco Dolstra
f93d8425c3 Installer test: Fix booting from SCSI 
This is required by the GRUB 1 test.
 2015-06-17 15:47:43 +02:00
Luca Bruno
d5628c982d Bypass /etc/gdm/Xsession. Closes #8351 2015-06-16 11:20:20 +00:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
lethalman
e08bbc0bc1 Merge pull request #8159 from cransom/dd-agent 
Allow custom tags to be set for datadog monitoring
 2015-06-15 18:43:14 +02:00
Casey Ransom
d3212beff9 Allow custom tags to be set for datadog monitoring 2015-06-15 16:37:27 +00:00
Eelco Dolstra
6e6a96d42c Some more type cleanup 2015-06-15 18:18:46 +02:00
Eelco Dolstra
c63bc92d4c types.uniq types.str -> types.str 2015-06-15 18:12:32 +02:00
Eelco Dolstra
19ffa212af types.uniq types.int -> types.int 
types.int already implies uniqueness.
 2015-06-15 18:11:32 +02:00
Eelco Dolstra
c738b309ee types.uniq types.bool -> types.bool 2015-06-15 18:10:26 +02:00
Eelco Dolstra
9366af1b94 "types.uniq types.string" -> "types.str" 2015-06-15 18:08:49 +02:00
Bjørn Forsman
74d5adcb4d nixos: move environment.{variables => sessionVariables}.MODULE_DIR 
This solves the problem that modprobe does not know about $MODULE_DIR
when run via sudo, and instead wrongly tries to read /lib/modules/:

  $ sudo strace -efile modprobe foo |& grep modules
  open("/lib/modules/3.14.37/modules.softdep", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
  open("/lib/modules/3.14.37/modules.alias.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)

Without this patch, one would have to use sudo -E (preserves environment
vars). But that option is reserved for sudo users with extra rights
(SETENV), so it's not a solution.

environment.sessionVariables are set by PAM, so they are included in the
environment used by sudo.
 2015-06-14 18:56:58 +02:00
Domen Kožar
a2deb7a2c9 Merge pull request #8322 from unaizalakain/master 
The user specified in the conf should run MPD
 2015-06-14 11:41:36 +02:00
Dan Peebles
10e75453b2 Factor the NixOS channel building code out into its own file, so I can use it elsewhere 2015-06-13 21:55:29 -04:00
Dan Peebles
ebde5fd9d4 Use the right nix when doing things in our amazoninit 2015-06-13 21:26:50 -04:00
Unai Zalakain
8811724ec9 The user specified in the conf should run MPD 2015-06-13 23:24:19 +02:00
Oliver Matthews
2434ee4aab Allow setting mediatomb interface 2015-06-13 15:16:28 +00:00
Luca Bruno
033605e87f Merge branch 'nixos-subdir' 
Conflicts:
	nixos/modules/system/boot/loader/grub/grub.nix
 2015-06-13 15:18:12 +02:00
Luca Bruno
c3e832b323 stage-1: mkdir -p /mnt-root, it may be created earlier by some hooks 2015-06-13 15:02:51 +02:00
Luca Bruno
3754de550f nixos/grub: allow customization of the nix store path 2015-06-13 15:02:00 +02:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Shea Levy
5ee75e236c apache-kafka: Enable overriding the kafka package 2015-06-12 15:56:06 -04:00
Sander van der Burg
fd187980c7 Put dysnomia in system environment if Disnix is enabled 2015-06-12 16:18:42 +00:00
Joachim Fasting
ffc6275e55 dnscrypt-proxy service: support custom providers 
The primary use-case is private DNSCrypt providers.

Also rename the `port` option to differentiate it from the
`customResolver.port` option.
 2015-06-12 15:12:33 +02:00
Joachim Fasting
8131065b63 dnscrypt-proxy service: use mkEnableOption 2015-06-12 15:12:33 +02:00
Joachim Fasting
2e8bc2bd5c nixos: cosmetic improvements to dnscrypt-proxy service module 
Remove superflous whitespace & comments
 2015-06-12 15:12:33 +02:00
Joachim Fasting
a88a6bc676 nixos: additional hardening for dnscrypt-proxy 
- Run as unprivileged user/group via systemd, obviating the need to
  specify capabilities, etc.
- Run with private tmp and minimal device name space
 2015-06-12 15:12:33 +02:00
Joachim Fasting
823bb5dd4d nixos: implement socket-activation for dnscrypt-proxy 
The socket definition is derived from upstream with the
exception that it does not depend on network.target, as
this creates a cycle between basic.target and sockets.target.

The apparmor profile has been updated to account for additional
runtime dependencies introduced by enabling systemd support.
 2015-06-12 15:12:33 +02:00
Joachim Fasting
dfe20de782 nixos: permit dnscrypt-proxy service to read basic user/group info 
If nscd is not running, dnscrypt-proxy crashes without read access
to /etc/{password,group,nsswitch.conf}.
 2015-06-12 15:12:30 +02:00
Thomas Tuegel
2a2448bcb7 Merge pull request #8182 from ttuegel/openblas 
Numerical computing overhaul
 2015-06-12 08:06:03 -05:00
Thomas Tuegel
c02dd4a726 Update release notes about OpenBLAS 2015-06-12 08:04:02 -05:00
Eelco Dolstra
07aa0f7f21 Revert "Use nixUnstable by default" 
This reverts commit 64a41b7a90.
 2015-06-12 13:20:18 +02:00
Luca Bruno
da7748a6fc nixos: set high fs.inotify.max_user_watches when xserver is enabled 2015-06-12 13:02:35 +02:00
Thomas Strobel
399b549611 Fix: xen-bridge systemd service 2015-06-12 12:52:14 +02:00
Thomas Strobel
a6e12c23fc Link Xen scripts to /etc/xen 2015-06-12 12:52:14 +02:00
Dan Peebles
4b758e374e Initial attempt at configuring from EC2 userdata (with input from cstrahan). Now with VM tests! 2015-06-11 23:16:35 -04:00
Dan Peebles
b6c589b2da Simple EC2 user-data VM test 2015-06-11 22:54:04 -04:00
William A. Kennington III
ffcd8acee6 nixos/pulseaudio: Fix description 2015-06-11 17:26:12 -07:00
Eelco Dolstra
cd28c5517c Revert "Drop tests.installer.grub1 as release critical" 
This reverts commit 1907ca8a2a. See

1907ca8a2a (commitcomment-9719007)
 2015-06-12 01:37:45 +02:00
Rickard Nilsson
7a0ca52267 scollector: Change type of collectors to allow proper merging 2015-06-11 16:49:43 +02:00
William A. Kennington III
502a19b2b4 nixos/grub: Support labeling efi bootloaders with independent id's 2015-06-10 15:47:08 -07:00
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
William A. Kennington III
c891134b77 nixos/grub: Prevent module errors and make gfxmode configurable 2015-06-10 11:50:35 -07:00
William A. Kennington III
aece1407d5 pulseaudio: Add a flag for supporting 32-bit 2015-06-10 11:50:35 -07:00
Daniel Peebles
6e73884c31 Merge pull request #8204 from copumpkin/modulesPath 
An importable modulesPath, once again
 2015-06-10 12:32:04 -04:00
Eelco Dolstra
8cf5d48d03 Make the boot test release-critical 2015-06-10 15:28:56 +02:00
Eelco Dolstra
8e88710693 Installer test: Remove apparently useless setting of nix.readOnlyStore 2015-06-10 15:28:56 +02:00
Eelco Dolstra
d906939e74 Installer tests: Don't use the ISO 
We already have separate tests for checking whether the ISO boots
correctly, so it's not necessary to do that here. So now
tests/installer.nix just tests nixos-install, from a regular NixOS VM
that uses the host's Nix store. This makes running the tests more
convenient because we don't have to build a new ISO after every
change.
 2015-06-10 15:28:56 +02:00
Eelco Dolstra
e5db79a859 Move stuff to modules/profiles/installation-device.nix 2015-06-10 15:28:55 +02:00
Eelco Dolstra
0f35f9bb69 Drop obsolete boot=on parameter 2015-06-10 15:28:55 +02:00
Lluís Batlle i Rossell
1c22734cd2 Forcing the load of atkbd in initrd. 
In some computers, having the module available does not really load it,
therefore, it results in not having the keyboard avaiable in initrd.
 2015-06-10 12:16:25 +02:00
Rob Vermaas
6d859229e1 Remove unnecessary option. My mistake... 2015-06-10 08:36:55 +00:00
Rob Vermaas
42323dc155 Merge cwoac:mysql_socket 2015-06-10 08:31:12 +00:00
Anders Lundstedt
d5b8dda043 mediatomb: fix hardcoded paths 2015-06-10 02:32:33 +02:00
Vladimír Čunát
0b68b92062 nixos i18n.consoleFont: choose a different default 
Distros often choose Terminus as the default, and it supports some
non-ASCII characters that we use in config. Fixes #8107.
 2015-06-09 20:13:42 +02:00
William A. Kennington III
48381b7621 nixos-artwork: Make into a derivation and use fetchfromgithub 2015-06-08 18:32:32 -07:00
William A. Kennington III
b79a5e812a nixos/quassel: Use qt5 instead of qt4 
This really speeds up building quassel daemon since qt5 can be built in
parallel while qt4 cannot.
 2015-06-08 15:37:34 -07:00
William A. Kennington III
7464908ae4 Merge pull request #8232 from dezgeg/pr-installer-fix 
install-cd: Include nixos-artwork to fix installer tests

With the move from storing grub images in the nixpkgs repo to storing them in the nix store, we broke the installer tests as the iso does not contain the artwork needed for the grub splash. This commit fixes the inclusion of the artwork in the iso.
 2015-06-08 14:42:57 -07:00
Tuomas Tynkkynen
16165ddc38 install-cd: Include nixos-artwork to fix installer tests 
Should fix at least nixos.tests.installer.simple.x86_64-linux
http://hydra.nixos.org/build/23001712:

machine# error: cannot download Encode-Locale-1.03.tar.gz from any mirror
machine# builder for ‘/nix/store/y8gbx2d2fdcvvjy1z53xksfgq66ydlx0-Encode-Locale-1.03.tar.gz.drv’ failed with exit code 1
machine# cannot build derivation ‘/nix/store/y1knci7rix3asnh2b4kfv8jhl2j99xih-perl-Encode-Locale-1.03.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/7xspjwh48kg16drv1jjg5cffaqbxbp8p-perl-libwww-perl-6.05.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/8qsmz3bbk1jwhh50c3i9700bkmn8ns5c-nss-cacert-3.19.1.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/0rgf2l3mdszs4a989ympwc9gk2k8wq6z-nixos-artwork-e71b684.drv’: 1 dependencies couldn't be built
...
 2015-06-08 19:12:59 +03:00
Jaka Hudoklin
b570c644c9 Merge pull request #8223 from offlinehacker/pkgs/rippled/update 
rippled: Update to 0.28.1
 2015-06-08 16:49:39 +02:00
Jaka Hudoklin
a5d0ac2003 Merge pull request #8227 from offlinehacker/nixos/consul/alerts-fix 
nixos/consul: fix consul alerts enable
 2015-06-08 14:34:48 +02:00
Jaka Hudoklin
161418537c rippled: Update to 0.28.1 2015-06-08 14:15:07 +02:00
Jaka Hudoklin
2e5dbc4746 Add ripple rest module 2015-06-08 13:48:23 +02:00
Jaka Hudoklin
c9da002a07 nixos/consul: fix consul alerts enable 2015-06-08 13:41:43 +02:00
Jaka Hudoklin
cc96e474d3 Merge pull request #8226 from offlinehacker/kubernetes/skydns 
Add skydns module
 2015-06-08 13:37:39 +02:00
Jaka Hudoklin
23504e5bf2 Add skydns module 2015-06-08 13:36:05 +02:00
Arseniy Seroka
e24eefedd6 Merge pull request #8217 from ip1981/mwlib 
mwlib uses pdftk to create books
 2015-06-08 14:28:12 +03:00
Jaka Hudoklin
f7a452c8c1 nixos/kubernetes: skydns integration 2015-06-08 13:15:26 +02:00
Jaka Hudoklin
392fc849e4 Update kubernetes to 0.18.0, fix module 2015-06-08 13:10:32 +02:00
Jaka Hudoklin
8b79a09f78 Merge pull request #7553 from offlinehacker/pkgs/python-packages/graphite-beacon 
Add graphite beacon package and module
 2015-06-08 12:17:01 +02:00
Jaka Hudoklin
509afe860b Merge pull request #7547 from offlinehacker/nixos/docker-registry/fixes 
nixos/docker-registry: docker independant docker registry
 2015-06-08 12:15:35 +02:00
Jaka Hudoklin
98d5b81dad nixos: add grafana module 2015-06-08 12:13:15 +02:00
Igor Pashev
d85be1cfa3 mwlib uses pdftk to create books 2015-06-08 08:35:12 +00:00
Dan Peebles
b13cb54614 Bring an importable modulesPath back from the dead, in the only way I know 2015-06-08 01:55:49 +00:00
William A. Kennington III
514a9fdf87 Merge pull request #8173 from dezgeg/pr-kernel-config 
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
 2015-06-07 10:14:51 -07:00
Peter Simons
42c65fd1c9 Merge pull request #8206 from bjornfor/postfix-var-mail 
nixos/postfix: make symlink /var/mail -> /var/spool/mail
 2015-06-07 18:10:11 +02:00
Domen Kožar
46b05f0e08 Merge pull request #8193 from lostdj/patch-1 
bittorrentsync: fix storage_path.
 2015-06-07 17:53:19 +02:00
Bjørn Forsman
12e84c6378 nixos/postfix: make symlink /var/mail -> /var/spool/mail 
This solves the problem of e.g. mutt not finding mail unless the user
sets MAIL=/var/spool/mail/$USER.

The default MAIL variable seems come from bash. Reasons for adding
symlink instead of changing MAIL default in bash:

- No need to rebuild world
- FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix
  NixOS mail location than change MAIL in bash to something that doesn't
  work on non-NixOS (however unlikely that users run nixpkgs bash on a
  non-NixOS distro...).

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES
 2015-06-07 10:38:11 +02:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
William A. Kennington III
ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Timofey Lagutin
714377f8dc bittorrentsync: fix storage_path. 
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".

As seen in f02d4ec9ed
Broken in 0539ed4771
 2015-06-05 18:39:01 +03:00
Eelco Dolstra
f1d465f429 pulseaudio: Revert to regular style 
Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
 2015-06-04 14:54:54 +02:00
Eelco Dolstra
18b5bd8dca Add some info about editors 2015-06-04 14:32:10 +02:00
Eelco Dolstra
7318ff0e38 Add option ‘system.extraDependencies’ for including stuff in the system closure 
Mostly useful for installer tests that don't have network access. This
generalizes virtualisation.pathsInNixDB and isoImage.storeContents.
 2015-06-04 11:06:44 +02:00
Eelco Dolstra
6bf1853387 Don't include 4 editors in the minimal installation CD 
Emphasis on "minimal".
 2015-06-04 11:06:44 +02:00
Tuomas Tynkkynen
9c2f2bc893 kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE 
Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.

Other distros have similar defaults, at least on Arch:
    CONFIG_FB_VESA=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
    CONFIG_FB_VESA=m
    CONFIG_FRAMEBUFFER_CONSOLE=y

Fixes #8139
 2015-06-04 11:26:20 +03:00
Eelco Dolstra
7c6b935b60 Remove dead code 2015-06-03 16:38:52 +02:00
lethalman
d144ece04e Merge pull request #8127 from ip1981/mwlib 
Add more dependencies for mwlib
 2015-06-03 12:50:02 +02:00
Wout Mertens
0666ee4739 Merge pull request #6732 from oconnorr/master 
Use mktemp to create temporary files to hold ssh host keys and authorized keys
 2015-06-02 20:34:43 +02:00
Luca Bruno
c12e1d7278 minimal-iso: enable nixos-manual 2015-06-02 18:14:45 +02:00
Igor Pashev
95c6b835cb mwlib may use pyfribidi 2015-06-02 06:14:34 +00:00
Igor Pashev
58f6da5cc6 mwlib may use imagemagick (convert) 2015-06-02 06:06:02 +00:00
Bjørn Forsman
70cb6e67c0 nixos/apcupsd: don't evaluate event hooks at build time 
Better replace the double quotes in 'echo "${commands}"' with single
quotes, to prevent the shell from doing command substitution etc. at
configuration build time.
 2015-06-01 22:14:03 +02:00
Eelco Dolstra
64a41b7a90 Use nixUnstable by default 2015-06-01 18:20:28 +02:00
lethalman
3b6dbb1917 Merge pull request #7984 from rushmorem/marathon-module-update 
Make it easy to override the marathon framework user
 2015-06-01 17:06:50 +02:00
Peter Simons
789f20eba8 nixos release notes: document new services.openssh.moduliFile option 2015-06-01 15:20:18 +02:00
Peter Simons
d4412bf6c4 nixos release notes: document incompatible changes due to Haskell NG 2015-06-01 15:19:53 +02:00
Peter Simons
4f0d8460c0 nixos release notes: add an item about Haskell NG 2015-06-01 14:43:40 +02:00
Domen Kožar
dc3316268e Merge branch 'master' into staging 2015-06-01 11:00:51 +02:00
Eelco Dolstra
7edb27b7af Hide the option fonts.enableCoreFonts 
We shouldn't have options that simply enable a package.
 2015-06-01 10:43:43 +02:00
William A. Kennington III
867d2c5c46 openssl: Remove References to OPENSSL_X509_CERT_FILE 2015-05-31 15:50:51 -07:00
William A. Kennington III
3588cd8c4e nixos/pulseaudio: Use libpulseaudio 2015-05-29 20:36:46 -07:00
William A. Kennington III
d6cbb061e3 cacert: Build directly from nss instead of our own tarball 2015-05-29 13:52:07 -07:00
William A. Kennington III
aa5d6922c5 Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config." 
The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.

This reverts commit fd1fb0403c.
 2015-05-29 13:26:51 -07:00
William A. Kennington III
1e98da6d99 nixos/grub: Use nixos artwork 2015-05-29 13:26:32 -07:00
William A. Kennington III
159fed47bc nixos/grub: Fix video display on efi 2015-05-29 13:26:32 -07:00
William A. Kennington III
d4f3930201 nixos/grub: Fix defaultConfig 2015-05-29 13:26:32 -07:00