Commit Graph

3406 Commits

Author SHA1 Message Date
Vladimír Čunát
55b03266cf nixos-generate-config: fix #12595: broadcom quoting
(cherry picked from commit 3e1599f57b)
2016-01-25 07:58:18 +01:00
Nikolay Amiantov
9e86366693 xserver service: wait for systemd-logind
This seems the right thing to do, and most likely has fixed the race condition
described at https://github.com/NixOS/nixpkgs/issues/12132#issuecomment-171284532

(cherry picked from commit b292e19fbd)
2016-01-14 14:34:18 +03:00
Nikolay Amiantov
ca431d1db9 teamviewer: 10.0.37742 -> 11.0.53191
(rebased version of commits c3d503d33d and a81b396a2e)

Extra care is taken to save old versions to minimize changes. Closes #12362
2016-01-14 14:08:29 +03:00
Eelco Dolstra
90f79de9ef linux: Make Unix domain sockets builtin
This hopefully fixes intermittent initrd failures where udevd cannot
create a Unix domain socket:

  machine# running udev...
  machine# error getting socket: Address family not supported by protocol
  machine# error initializing udev control socket
  machine# error getting socket: Address family not supported by protocol

The "unix" kernel module is supposed to be loaded automatically, and
clearly that works most of the time, but maybe there is a race
somewhere. In any case, no sane person would run a kernel without Unix
domain sockets, so we may as well make it builtin.

http://hydra.nixos.org/build/30001448
(cherry picked from commit e4b4e9b986)
2016-01-11 17:10:18 +01:00
Svein Ove Aas
788f56ae15 zfs:Add zfs.devNodes option for zpool import -d
(cherry picked from commit 9a82dd87f7)

Reason: Importing devices from /dev/disk/by-id can prevent certain bugs
that lead to ZFS pool corruption, as mentioned in #11668.

That said, although this adds the option to import from /dev/disk/by-id,
I'm not yet changing the default import path in the stable channel
because possibly some block devices may not show up in /dev/disk/by-id,
causing a perfectly-working system to become unbootable. It's probably
safer to battle test the new default path in the unstable channel
instead, and let it become part of the stable channel as part of the
next NixOS release.
2016-01-07 13:52:54 +01:00
Eelco Dolstra
6d7a6b8018 install-grub: Make more robust against GC'ed system profile entries
Previously this barfed with:

  updating GRUB 2 menu...
  fileparse(): need a valid pathname at /nix/store/zldbbngl0f8g5iv4rslygxwp0dbg1624-install-grub.pl line 391.
  warning: error(s) occured while switching to the new configuration

(cherry picked from commit 1ba2015450)
2016-01-05 16:56:51 +01:00
Eelco Dolstra
385dcc90d2 kdmrc: Build locally
(cherry picked from commit 22848d55e2)
2016-01-05 16:56:27 +01:00
Tobias Geerinckx-Rice
7c06bf69d7 liferea, graphite service: fix typo (agregator -> aggregator)
(cherry picked from commit a133ef9a0c)
2016-01-05 09:34:00 +01:00
Eelco Dolstra
014260a9d6 NixOS tests: Increase hung_task_timeout_secs
This hopefully fixes intermittent test failures like

  http://hydra.nixos.org/build/29962437

  router# [  240.128835] INFO: task mke2fs:99 blocked for more than 120 seconds.
  router# [  240.130135]       Not tainted 3.18.25 #1-NixOS
  router# [  240.131110] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.

assuming that these are caused by high load on the host.

(cherry picked from commit 6d02d7e740)
2016-01-04 17:08:59 +01:00
Vladimír Čunát
5b1a0a9584 kernel: do not load configs module (close #10912)
... because we make it built-in by default.
I can't imagine anyone who wanted to purge this module from his/her system,
so let's keep it simple, at least for now.

(cherry picked from commit 0e1fe66aad)
This change should "only" get rid of an annoying error in logs.
2016-01-04 14:04:20 +01:00
Domen Kožar
4e12825cd4 networkmanager: set uid/gid for the networkmanager openvpn agent
Backports c515be4651

The same uid/gid is taken for future compatibility.
2016-01-04 11:41:53 +01:00
Tobias Geerinckx-Rice
c2b35f9dd3 nixos: samba module: fix typo & clarify
(cherry picked from commit b6c24c12b4)
2016-01-03 20:30:39 +01:00
Emery Hemingway
a09c1f5be8 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.

(cherry picked from commit 2b6dcdfcd0)
Best be consistent with active release branches as well.
2016-01-02 12:35:25 +01:00
Eelco Dolstra
b739c56065 Add some preferLocalBuild
(cherry picked from commit 7906169ce1)
2015-12-29 17:22:22 +01:00
Eelco Dolstra
fac7ff90dd Force rebuild of some corrupted files
(cherry picked from commit 74aac17878)
2015-12-29 16:40:27 +01:00
Tuomas Tynkkynen
0d544537ca installation-cd: Add separate boot entry that has 'nomodeset'
We seem to be in an unfortunate situation: booting without 'nomodeset'
causes hangs when booting on some NVIDIA cards (6948c3ab80), but on the
other hand adding 'nomodeset' prevents X from starting on other hardware
(e.g. issue #10381 and my Thinkpad X250 with an integrated Broadwell GPU).

Attempt to remedy this situation a bit by adding a separate entry in the
ISOLINUX menu (with the non-'nomodeset' being the default).

(cherry picked from commit 269f261c73)
2015-12-26 07:37:09 -05:00
Avery Glitch
aba90f5186 autoUpgrade: added a 'dates' option, to allow you to switch when the upgrade happens 2015-12-18 19:13:06 +11:00
Eelco Dolstra
fb1377a14a
Add option to link additional package outputs into system.path
This is necessary to get stuff like separate manpages, info files,
debug symbols, etc.

(cherry picked with resolved conflicts from commit 58e9440)
2015-12-10 18:38:14 +01:00
Eelco Dolstra
7b2291b1f3 Add option environment.enableDebugInfo
This makes the debug outputs of packages that have them available to
programs like gdb.

(cherry picked from commit d9d5c98c56)
2015-12-10 16:11:52 +01:00
Eelco Dolstra
e3cc3c9b16 Factor out "man" into a separate module and add "man" outputs to system.path
Fixes #10270.

(cherry picked from commit c20403631d)
2015-12-10 16:11:34 +01:00
Bjørn Forsman
1a86bf8aae nixos/redmine: improve assert message
Give the user more context.

(cherry picked from commit 2acf59efa4)
2015-12-08 22:53:59 +01:00
Robbin C
7bf4567613 Change argument --port to --listen in nix-serve.nix
(cherry picked from commit c75d1e761a)
2015-11-16 11:48:45 +01:00
Eelco Dolstra
4d9166084d Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-11-14 16:17:57 +01:00
Guillaume Maudoux
5f79c8dacf lighttpd: fix mod_rewrite appearing twice
(cherry picked from commit 60ba5ad479)
2015-11-14 15:53:11 +01:00
Nikolay Amiantov
16c0f4c14b nixos/tlp: workaround early build trigger 2015-11-05 16:25:39 +03:00
Bjørn Forsman
050bdc3534 nixos: add services.jenkins.jobBuilder option
This option allows to define (declarative) Jenkins jobs, using Jenkins
Job Builder (JJB) as backend.

Example:

  services.jenkins = {
    enable = true;
    jobBuilder = {
      enable = true;
      yamlJobs = ''
        - job:
            name: jenkins-job-test
            builders:
              - shell: echo 'Hello world!'
      '';
    };
  };

Jobs can be defined using YAML, JSON and Nix.

Note that it really is declarative configuration; if you remove a
previously defined job, the module will remove the jobdir under
$JENKINS_HOME.

Jobs managed through the Jenkins WebUI (or by other means) are not
touched by this module.

Changes v1 -> v2:
* add nixJobs
* let jsonJobs take a list of strings (allows merge)
* 4 space indent in shell code

(cherry picked from commit 27f41d8c0a)
2015-11-05 09:05:28 +01:00
Peter Simons
7f7d9eaadb postfix: don't create a symlink inside of /var/spool/mail if /var/mail exists already
(cherry picked from commit 2bb705da15)
2015-11-02 14:34:07 +01:00
Bjørn Forsman
c2ca3044e6 nixos/jenkins: force .war (re)extraction at start-up
Or else we might run stale Jenkins.

(cherry picked from commit f25b36df3c)
2015-11-02 10:40:14 +01:00
Domen Kožar
551dad3ffd nm-openvpn: add user/group, closes #10689 2015-10-29 09:58:38 +01:00
Domen Kožar
628761169c nova-image: use make-disk-image.nix
(cherry picked from commit f1508b3a23)
2015-10-26 16:20:40 +01:00
aszlig
b56f67dcaf
nixos/postgresql: Fix execution of initialScript.
Regression introduced by b21fd5d066.

The initialScript is only executed whenever there is a .first-startup in
the dataDir, so silently dropping the file essentially breaks
initialScript functionality.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 60d407b209)
2015-10-25 16:06:36 +01:00
Domen Kožar
4c2bbb248c networkmanager: don't check if subject is active (false in my X session) 2015-10-23 20:15:56 +02:00
Eelco Dolstra
9c65751443 Prevent future store path references in the manual
(cherry picked from commit 5b8dae8ef3)
2015-10-23 01:21:33 +02:00
Eelco Dolstra
fe770728c5 Manual: Remove store path references
(cherry picked from commit 89e983786a)
2015-10-23 01:21:27 +02:00
Hajo Möller
2f3fe48a26 service.asterisk: fix dir creation 2015-10-19 23:03:38 +02:00
Pascal Wittmann
71e29b42df Merge pull request #10384 from robbinch/fix-statd
Fix typo in nixos/modules/tasks/filesystems/nfs.nix.
(cherry picked from commit 78b2851724)

Close #10394.
2015-10-15 09:33:57 +02:00
Eelco Dolstra
43509b5328 Give more memory for the disk image builder
http://hydra.nixos.org/build/26480662
(cherry picked from commit 106738b196)
2015-10-08 11:21:44 +02:00
Bjørn Forsman
53481fee51 nixos/jenkins: reduce default environment
Don't pull in all of environment.sessionVariables, only add what's
needed for nix and HTTPS to work (which was the point of the previous
patch).

(cherry picked from commit 04e748e61f)
2015-10-07 16:02:03 +02:00
Bjørn Forsman
3e77e3962a nixos/jenkins: rework environment handling
Jenkins gets (by default) an additional environment of

  { NIX_REMOTE = "daemon"; }

This has the following problems:

  1. NIX_REMOTE disappears when users specify additional environment
     variables, because defaults have low merge priority.
  2. nix cannot be used without additional NIX_PATH envvar, which is
     currently missing.
  3. If you try to use HTTPS, you'll see that jenkins lacks
     SSL_CERT_FILE envvar, causing it to fail.

This commit adds config.environment.sessionVariables and NIX_REMOTE to
the set of variables that are always there for jenkins, making nix and
HTTPS work out of the box.

services.jenkins.environment is now empty by default.

(cherry picked from commit 67723df930)
2015-10-07 16:02:03 +02:00
Rob Vermaas
e170fb4cb7 hologram-server: use bin output of goPackages.hologram. 2015-10-06 09:35:52 +00:00
Eelco Dolstra
c6d11a1f0d Fix nixos-upgrade
(cherry picked from commit e65b8fcebe)
2015-10-05 09:32:55 +02:00
Bjørn Forsman
ab0a464e4b nixos/docker: default storageDriver to "devicemapper"
Commit 9bfe92ecee ("docker: Minor improvements, fix failing test") added
the services.docker.storageDriver option, made it mandatory but didn't
give it a default value. This results in an ugly traceback when users
enable docker, if they don't pay enough attention to also set the
storageDriver option. (An attempt was made to add an assertion, but it
didn't work, possibly because of how "mkMerge" works.)

The arguments against a default value were that the optimal value
depends on the filesystem on the host. This is, AFAICT, only in part
true. (It seems some backends are filesystem agnostic.) Also, docker
itself uses a default storage driver, "devicemapper", when no
--storage-driver=x options are given. Hence, we use the same value as
default.

Add a FIXME comment that 'devicemapper' breaks NixOS VM tests (for yet
unknown reasons), so we still run those with the 'overlay' driver.

Closes #10100 and #10217.

(cherry picked from commit 5f17aeb403)
2015-10-04 14:36:38 +02:00
Bjørn Forsman
01906ec98a nixos/modules: simplify pkgs.zfs handling
Thanks, @lethalman.

(cherry picked from commit 424e6e501a)
2015-10-04 14:33:03 +02:00
Casey Ransom
b9791bbf2f nixos/docker: Include ZFS commands in PATH for ZFS storagedriver
When using the ZFS storagedriver in docker, it shells out for the ZFS
commands. The path configuration for the systemd task does not include
ZFS, so if the driver is set to ZFS, add ZFS utilities to the PATH.

This will resolve https://github.com/NixOS/nixpkgs/issues/10127

[Bjørn: prefix commit message with "nixos/docker:", remove extra space
before ';']

(cherry picked from commit 791b600aac)
2015-10-04 14:15:04 +02:00
Eelco Dolstra
9c31c72caf Revert "nixos/fonts: Add unifont to list of default fonts."
This reverts commit 53746ff9d2 because
it increases default system closure size significantly. It's also
unnecessary - people can always add fonts themselves.
2015-09-30 21:46:06 +02:00
Domen Kožar
5af517518e typos
(cherry picked from commit aca373c6b2)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-30 21:27:37 +02:00
Nicolas B. Pierron
15760fbaba Add pkgs module argument documentation for #6794 incompatible change.
(cherry picked from commit 50146ce815)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-30 21:27:30 +02:00
Eelco Dolstra
9cbf796fd2 Bump fallback Nix store paths
(cherry picked from commit 3231424c37)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-30 21:26:58 +02:00
aszlig
53746ff9d2 nixos/fonts: Add unifont to list of default fonts.
This fixes #10077 because after some debugging it turns out that by
default we don't have a font which is able to display Chinese symbols.

Thanks to @anderspapitto, @kmicu and hyper_ch on IRC to help debugging
this issue, see log at:

http://nixos.org/irc/logs/log.20150926 starting at 19:46

With unifont we have a reasonable fallback font to ensure that every
written language is rendered correctly and thus less surprise for new
users who keep their font settings at the default.

Reported-by: Anders Papitto <anderspapitto@gmail.com>
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit ebf1f51641)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-30 21:06:46 +02:00
Domen Kožar
e13b657670 update release notes for 15.09 2015-09-30 19:04:04 +02:00