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
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