AndersonTorres
d004ac6857
Oroborus: init at 2.0.20
...
Oroborus (named after the self-eating snake) is a minimalistic window manager.
2015-07-23 13:50:26 -03:00
Eelco Dolstra
1a03de173b
Move release notes to an appendix and a separate chunk
2015-07-22 16:21:32 +02:00
Eelco Dolstra
48a25dc899
Manual: Reduce chunking
...
Fixes #7607 .
2015-07-22 16:21:32 +02:00
Eelco Dolstra
606d34e45a
Revert "Revert "Drop tests.installer.grub1 as release critical""
...
This reverts commit cd28c5517c
. Still broken:
http://hydra.nixos.org/build/23928152
2015-07-22 15:20:40 +02:00
Eelco Dolstra
57e48df19e
Remove non-incompatible changes from the list of incompatible changes
2015-07-22 15:17:01 +02:00
Eelco Dolstra
e2b25f9434
Use environment.etc to manage /etc/crontab
...
Otherwise, /etc/crontab won't be deleted when cron is disabled.
2015-07-22 15:15:09 +02:00
Eelco Dolstra
201f9beddb
Don't enable cron by default
...
The rationale for disabling this is: 1) systemd timers are better; 2)
it gets rid of one usually unnecessary process, which makes containers
more light-weight.
Note that cron is still enabled if services.cron.systemCronJobs is
non-empty, so this only matters if you have no declarative cron jobs
but do have user cron jobs.
2015-07-22 15:15:09 +02:00
Tuomas Tynkkynen
a6c95a3f7d
extlinux-conf-builder: Set menu title to force prompt display
...
Without a menu title, U-Boot's distro scripts just autoboot the first
entry by default.
When I initially wrote this, my board wasn't apparently running stock
U-Boot but had some local hacks saved in the U-Boot's environment
which made it always display the prompt.
2015-07-22 16:08:18 +03:00
Tuomas Tynkkynen
8496f71e92
extlinux-conf-builder: Make it work on non-DTB systems
...
With this, boot.loader.generic-extlinux-compatible can be used with
linuxPackages_rpi on the Raspberry Pi.
2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
6147909f8e
extlinux-conf-builder: Properly copy kernels for the default entry
...
When calling addEntry inside a subshell, the filesCopied array would
be updated only in the subshell's environment. This would only cause an
issue if no -g flag was passed to the script, causing no kernels
to be copied.
2015-07-22 16:08:17 +03:00
Tuomas Tynkkynen
1947179036
nixos/rogue: Set WorkingDirectory to /tmp
...
Otherwise we can get an ugly /rogue.scr in the root of the filesystem
hierarchy.
2015-07-22 16:08:17 +03:00
Eelco Dolstra
fab3090693
Don't include wireless tools in containers
2015-07-22 12:51:21 +02:00
Eelco Dolstra
4232f5d219
Disable system_tarball_pc and fix eval
...
It refers to a kernel version that no longer exists.
(cherry picked from commit e4b9624ca8
)
2015-07-22 12:27:15 +02:00
Tuomas Tynkkynen
5d02c02a9b
systemd: Use upstream tmpfiles.d rules
...
This fixes a failing assert in systemd-timesyncd (issue #5913 ) as it
expects the directory /run/systemd/netif/links/ to exist, and nothing in
NixOS currently creates it.
Also we get a net reduction in our code as rules for /run/utmp and
/var/log/journal are also provided by the same upstream file.
(cherry picked from commit a278a9224a
)
2015-07-22 12:27:05 +02:00
Eelco Dolstra
925e1f91c5
Set up /etc/machine-id before starting systemd
...
Otherwise, systemd will try to populate /etc, which we don't want.
(cherry picked from commit c8501a4218
)
2015-07-22 12:24:32 +02:00
Eelco Dolstra
0ab320a884
stage-1: Shut up warnings about swap devices that don't exist yet
...
(cherry picked from commit 388dac478d
)
2015-07-22 12:24:06 +02:00
Eelco Dolstra
ec82157ac5
stage-2: Don't run hwclock in containers
...
(cherry picked from commit b978df019a
)
2015-07-22 12:23:52 +02:00
Eelco Dolstra
9647609e3e
stage-1: Don't mount /dev/shm if it's already mounted
...
(cherry picked from commit c8ef598945
)
2015-07-22 12:23:48 +02:00
Eelco Dolstra
6bd4e0b8cd
Create systemd-{network,resolve} user/group unconditionally
...
This shuts up this error from dbus:
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-network" in message bus configuration file
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-resolve" in message bus configuration file
which happens because the D-Bus config for networkd/resolved is
enabled unconditionally, and we don't have an easy way to turn it off.
(cherry picked from commit f19b58fb6a
)
2015-07-22 12:23:45 +02:00
Eelco Dolstra
65700b435c
Use ConditionVirtualization to disable some services in containers
...
(cherry picked from commit c52a983806
)
2015-07-22 12:23:40 +02:00
Mateusz Kowalczyk
8d70b5cd91
Merge pull request #8904 from Fuuzetsu/docker-custom-postStart
...
docker: allow the user to override postStart
2015-07-21 19:13:54 +01:00
Charles Strahan
babb744b71
riak: new nixos service
2015-07-21 09:25:41 -04:00
Mateusz Kowalczyk
23187c3431
docker: allow the user to override postStart
...
My use-case: passing -H SOM.EIP.ADD.RES:PORT doesn't result in a .sock
file so the service would never go up.
2015-07-20 14:28:49 +01:00
Austin Seipp
0c4fca7d61
Merge pull request #8690 from laMudri/synaptics
...
synaptics: fix to allow for more scrolling choices
2015-07-19 12:50:33 -05:00
Oliver Charles
08c192a40b
devmon: New service
2015-07-19 13:39:00 +01:00
Vladimír Čunát
9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
Luca Bruno
fc5b0f826f
release notes: phpfpm now using default php instead of php54
2015-07-17 18:18:43 +02:00
Luca Bruno
883517f37c
phpfpm: use latest php
2015-07-17 18:09:50 +02:00
Arseniy Seroka
19e5fd60b3
slim: use nixos theme by default
2015-07-17 17:01:07 +03:00
Eelco Dolstra
b1623385d0
nixos-generate-config: Container improvements
2015-07-17 11:27:33 +02:00
Eelco Dolstra
c46e424c8f
Remove obsolete reference to /media
2015-07-17 11:27:33 +02:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
tv
1306c11b94
bitlbee service: fix typo
2015-07-16 02:43:27 +02:00
William A. Kennington III
6281c618cf
lightdm: Fix location of loaders.cache after 4982143324
2015-07-15 15:30:39 -07:00
Thomas Strobel
2ff9129337
xen: fixes (authored by michalpalka)
...
Xen required a few changes in order to be usable:
* Include xenfs module in initrd as loading it in the activation
script was failing.
* Include /etc/default/xendomains, which is needed by
xen-domains service.
* Create /var/log/xen and /var/lib/xen directories in
the xen-store service, which are needed by the xl command.
The directories could be created by any other script as long as
they are guaranteed to exist before xl is called.
* Fix a reference to /bin/ls in the xendomains script.
2015-07-15 12:38:37 +02:00
William A. Kennington III
25e60feb72
Merge branch 'master.upstream' into staging.upstream
2015-07-15 02:02:46 -07:00
James Felix Black
be5ad1d07c
window-manager service: add notion
...
Add the notion window manager to the windowManager service definition.
2015-07-14 12:36:59 -04:00
Eelco Dolstra
4c0e44c34c
Make OpenJDK release-critical
...
Currently there are no tests that depend on the JDK. Since we don't
want a release with a broken JDK, make it an explicit dependency of
the "tested" jobs.
2015-07-14 16:03:29 +02:00
Ryan Mulligan
9d485d9433
heyefi service: make uploadDir path more generic and a string
2015-07-14 06:56:30 -07:00
Ryan Mulligan
d11edff860
heyefi service: use mkEnableOption
2015-07-14 06:54:51 -07:00
Ryan Mulligan
d6cee31b04
heyefi service: init
2015-07-14 06:42:02 -07:00
William A. Kennington III
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
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