3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3850 commits

Author SHA1 Message Date
Spencer Whitt ff58711bda zsh module: add enableCompletion option 2015-11-25 10:32:58 -05:00
zimbatm ad2a4ab24c ruby: remove insecure 1.8.7, fixes #11194
1.8.x is unsupported and is probably insecure.

This also simplifies things a little bit
2015-11-25 12:10:03 +01:00
zimbatm e7cd9077a8 s3sync: delete dead project
According to http://s3sync.net/wiki.html, https://github.com/ms4720/s3sync was
supposed to take over the development but nothing has happened in 4 years.

The project is unfortunately dead and is our only dependency to ruby 1.8.
2015-11-25 11:51:09 +01:00
Arseniy Seroka 13426c1451 Merge pull request #10512 from makefu/bepasty-init-dev
services/misc/bepasty: init at 2015-10-21
2015-11-24 19:35:08 +03:00
Rickard Nilsson 38196171e8 Merge pull request #10773 from rvl/longview
Linode Longview package and module
2015-11-24 13:16:30 +01:00
lethalman 8099d8189b Merge pull request #11108 from ericsagnes/ibus-dconf
ibus: fix dconf dependency
2015-11-24 10:16:08 +01:00
Raymond Gauthier 662bbb526c thunar: improvements (close #10306)
Add the possibility to specify plugin set to
be used as overridable `thunar` derivation argument.

New nixos config attribute:
`services.xserver.desktopManager.xfce.thunarPlugins`
that allows user to specify plugins in the context
of nixos.

Tests:

 -  With and without plugins.
 -  Using the nixos attributes.
2015-11-24 09:51:39 +01:00
makefu 0bdc5e269b services/misc/bepasty: init at 2015-10-21
This module implements a way to start one or more bepasty servers.
It supports configuring the listen address of gunicorn and how bepasty
behaves internally.

Configuring multiple bepasty servers provides a way to serve pastes externally
without authentication and provide creating,listing,deleting pastes interally.
nginx can be used to provide access via hostname + listen address.

`configuration.nix`:

    services.bepasty = {
      enable = true;
      servers = {

        internal = {
          defaultPermissions = "admin,list,create,read,delete";
          secretKey = "secret";
          bind = "127.0.0.1:8000";
        };

        external = {
          defaultPermissions = "read";
          bind = "127.0.0.1:8001";
          secretKey = "another-secret";
        };
      };
    };
2015-11-23 22:10:14 +01:00
Thomas Tuegel 56b407f0e7 nixos/kde5: correctly locate oxygen-icons 2015-11-23 13:46:10 -06:00
Ollie Charles 52f872ec27 services.xserver: Disable Ctrl+Alt+Backspace by default
Ctrl+Alt+Backspace is usually enabled by default under X, and is a
keyboard shortcut that forcefully kills the current X server. This can
lead to data loss by users if accidentally pressed. This commit
introduces a new option, services.xserver.enableCtrlAltBackspace, that
is *disabled* by default. If set to true, the previous behavior can be
restored.

A similar decision was made by the Ubuntu team, and is documented here:
https://wiki.ubuntu.com/XorgCtrlAltBackspace
2015-11-23 14:48:56 +00:00
Thomas Tuegel 314d3e52e8 add nixos/tests/sddm 2015-11-23 06:39:19 -06:00
Thomas Tuegel 38bf645266 nixos/kde5: plasma-5.5 update 2015-11-23 06:39:09 -06:00
lethalman ff36329af9 Merge pull request #11214 from spacefrogg/pam_env-fix
display-managers: fix pam_env.so usage
2015-11-23 10:28:58 +01:00
Michael Raitza 338576cace display-managers: fix pam_env.so usage
Fixed usage of pam_env.so PAM module in lightDM and GDM.
2015-11-22 21:25:11 +01:00
Edward Tjörnhammar bfcde5cc38 i2pd: patch to enable tunnelcfg usage
nixos: i2pd service, use tunnelscfg to pass nix tunnel specifications
2015-11-22 20:35:59 +01:00
Unai Zalakain 09bdfd5c35 nixos/transmission: create user-provided download-dir, incomplete-dir
Currently only the hardcoded default directories are created, not the
directories that the user may have provided. Fix that.

[Bjørn: fix small typo (%{settingsDir} => ${settingsDir}) and change
commit message.]
2015-11-22 14:56:54 +01:00
Rodney Lorrimar 33f869ba1e longview nixos module: improve description for mysql password config options 2015-11-22 12:37:00 +00:00
Rodney Lorrimar 33c2b8a1f1 longview nixos module: add config options for service monitoring 2015-11-22 12:37:00 +00:00
Rodney Lorrimar bc3fb79619 longview nixos module: init 2015-11-22 12:37:00 +00:00
obadz a05a340e26 PAM: reorganize the way pam_ecryptfs and pam_mount get their password
Run pam_unix an additional time rather than switching it from sufficient
to required. This fixes a potential security issue for
ecryptfs/pam_mount users as with pam_deny gone, if cfg.unixAuth = False
then it is possible to login without a password.
2015-11-21 21:10:40 +00:00
Roger Qiu 1ddbc20dac Change the preset networking.hostId to use mkDefault so it can be easily changed by the user later 2015-11-22 01:03:16 +11:00
Luca Bruno a6c42b5945 nixos/docker: enable socketActivation by default 2015-11-20 23:01:59 +01:00
Nicolas B. Pierron 4e61fc89d2 Merge pull request #11106 from nbp/nixos-reentry
Add a way to pin a NixOS version within the module system.
2015-11-20 20:11:21 +00:00
Nicolas B. Pierron a5992ad61b Add a way to pin a NixOS version within the module system.
This modification add a way to re-evaluate the module system with a
different version of NixOS, or with a different set of arguments.
2015-11-19 20:58:45 +00:00
Eelco Dolstra dec09c2220 services.cron.enable: Remove misleading default
Elsewhere we set it to "mkDefault (allFiles != [])" to the default has
no effect.
2015-11-19 14:25:16 +01:00
Jonas D 5ffbc9755a Add focus_password if defaultUser is set
Add 'focus_password yes' if defaultUser is set, to reflect the description of defaultUser.
2015-11-18 23:49:39 +01:00
Arseniy Seroka 54119cc48c slim service: update default theme 2015-11-19 01:30:24 +03:00
Jaka Hudoklin 22c61d3bfc Merge pull request #10218 from offlinehacker/nixos/format_options
add support for auto format, format options
2015-11-18 22:33:01 +01:00
Jaka Hudoklin cbca877b01 Merge pull request #11056 from offlinehacker/nixos/systemd/onfailure
systemd module: Add OnFailure to systemd common unit options
2015-11-18 22:30:07 +01:00
Peter Simons 0ccc515b48 nixos: remove debug code accidentally checked in with 833a597156 2015-11-18 16:37:38 +01:00
Peter Simons 833a597156 nixos: configure bash prompt in Emacs' shell-mode, even if TERM=dumb
The idea that the interactive bash prompt isn't set in case of TERM=dumb
is intended to fix problems when other machines log remotely into a
NixOS installation via Tramp. A side-effect that change was, however,
that Emacs' shell-mode no longer had a correct prompt. I suppose the
presence of

  INSIDE_EMACS=24.5.2,comint

is a sufficiently unique indication that the current interactive shell
is running inside of an Emacs and that the prompt can thus be configured
safely.
2015-11-18 16:27:41 +01:00
Ollie Charles 013b848346 devmon: Non-root user, set PATH, require udisks2
devmon refuses to run as root. Instead, we now run it as a user service,
and enable udisks2 in order to perform the mounts.
2015-11-18 11:30:08 +00:00
Eric Sagnes 7cead2e990 ibus: fix dconf dependency 2015-11-18 11:29:31 +09:00
Jaka Hudoklin be067811ff Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-17 17:18:24 +01:00
Jaka Hudoklin 7955be7a82 Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0
bosun: 0.3.0 -> 0.5.0-alpha, udpate module
2015-11-17 17:17:44 +01:00
Jaka Hudoklin 0667fe29c9 Merge pull request #11061 from offlinehacker/nixos/heapster/add
heapster module: init
2015-11-17 17:17:01 +01:00
Jaka Hudoklin dfd1f14ca5 Merge pull request #11058 from offlinehacker/nixos/kubernetes1/git
kubernetes module: kubelet add git and ssh to path
2015-11-17 17:14:44 +01:00
Jaka Hudoklin 69a1b3977b Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0
grafana: 2.0.0-beta1 -> 2.5.0
2015-11-17 17:14:23 +01:00
Jaka Hudoklin aa4bad4c17 heapster module: init 2015-11-16 16:58:10 +01:00
Jaka Hudoklin dd1f8b2693 kubernetes module: kubelet add git and ssh to path 2015-11-16 15:19:56 +01:00
Jaka Hudoklin b9291616a6 systemd module: Add OnFailure to systemd common unit options 2015-11-16 15:12:28 +01:00
Jaka Hudoklin 9671d36011 grafana module: update 2015-11-16 14:59:25 +01:00
Jaka Hudoklin 0775a89c11 bosun module: update module 2015-11-16 14:24:02 +01:00
Jaka Hudoklin 9c1943fb6f influxdb: 0.8.3 -> 0.9.4, fix module 2015-11-16 14:22:08 +01:00
Domen Kožar 0567714b99 Merge pull request #10610 from joachifm/scsi-link-pm
nixos: set scsi link power policy using udev
2015-11-16 13:21:36 +01:00
Domen Kožar b76519069d Merge pull request #9733 from basvandijk/wordpress-fix-extraConfig
wordpress: execute the extraConfig before loading wp-settings.php
2015-11-16 13:16:10 +01:00
Rickard Nilsson 3e18ddae49 Merge pull request #11005 from robbinch/fix-nix-serve
Change argument --port to --listen in nix-serve.nix
2015-11-16 11:43:31 +01:00
Pascal Wittmann e136ce10bb Merge pull request #11022 from dasjoe/manual
nixos manual: point to NixOps' homepage, not Github
2015-11-15 20:03:31 +01:00
William A. Kennington III 4ead61ca39 Merge remote-tracking branch 'upstream/master' into master.upstream 2015-11-14 12:33:53 -08:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Hajo Möller f1ac7bf80a nixos manual: point to NixOps' homepage, not Github 2015-11-14 17:17:29 +01:00
Guillaume Maudoux 60ba5ad479 lighttpd: fix mod_rewrite appearing twice 2015-11-14 15:52:25 +01:00
William A. Kennington III 9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Lengyel Balázs 162542bf8f fix: ihaskell's and xmonad's dependence on haskell-ng 2015-11-13 19:14:40 +01:00
Arseniy Seroka 9dd3e5fd3f Merge pull request #10993 from oxij/nixos-actkbd-tinyfix
[trivial] nixos: add actkbd package to environment in actkbd module
2015-11-13 17:39:44 +03:00
Robbin C c75d1e761a Change argument --port to --listen in nix-serve.nix 2015-11-13 21:25:50 +08:00
James Cook 225642e25a Update comment for gdm service.
Emphasize experimental nature slightly less, but say it's only really
tested with Gnome.
2015-11-12 20:58:43 -08:00
Jan Malakhovski 95a723d516 nixos: add actkbd package to environment in actkbd module 2015-11-12 21:05:07 +00:00
Nikolay Amiantov 9800862397 nixos/autofs: revive and update to systemd 2015-11-11 16:18:57 +03:00
Pascal Wittmann 14ecf0c7fb services.tlsdated: use google.com as default host
www.ptb.de returns incorrect dates.
2015-11-11 12:07:08 +01:00
Chris Martin 00c42fdda1 redshift: document lat/long and temp bounds 2015-11-10 22:28:37 -08:00
Nikolay Amiantov d4c27381dc Merge pull request #10460 from abbradar/remote-askpass
Support network in initrd and entering LUKS passphrase via SSH
2015-11-10 16:41:34 +03:00
Tomasz Kontusz d3f6434579 virtualbox service: hide vboxnet0 from NetworkManager, fixes #10862 2015-11-10 12:21:35 +01:00
Tomasz Kontusz 6681c66db8 networkmanager service: add unmanaged option 2015-11-10 12:20:55 +01:00
Alexei Robyn 91fe21c854 quassel service: Support multiple listen addresses, fixes #10924 2015-11-10 11:10:21 +01:00
Nikolay Amiantov 23845d7084 tlp: add x86_energy_perf_policy, refactor 2015-11-09 17:29:59 +03:00
rnhmjoj 2a0f9d40ff i18n: add color scheme option (close #9626) 2015-11-09 14:53:59 +01:00
Robert Glossop 5623e1b145 Add the CLFSWM window manager 2015-11-08 18:49:40 -05:00
Peter Simons adb74ad2f9 Merge pull request #10620 from gebner/postfix-3.0.3
postfix: 2.11.5 -> 3.0.3
2015-11-08 18:10:26 +01:00
William A. Kennington III a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Rickard Nilsson fa3dad1f9c nixos/bosun: Make the check frequency configurable 2015-11-07 23:59:23 +01:00
Domen Kožar 07405ee187 Merge pull request #9463 from khumba/nm-connection-sharing
Fix NetworkManager connection sharing
2015-11-06 11:16:50 +01:00
Domen Kožar e695b245a9 Merge pull request #9805 from Mathnerd314/quassel-fix
quassel: Start after its databases
2015-11-06 11:14:54 +01:00
Domen Kožar 23adabcb8f Merge pull request #10746 from jgertm/fix-wol-doc
Fixed wrong documentation for Wake-On-LAN feature
2015-11-06 10:57:48 +01:00
William A. Kennington III 2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Nikolay Amiantov 452dbfd288 nixos/tlp: workaround early build trigger 2015-11-05 16:22:10 +03:00
Thomas Tuegel 90cc190db2 Merge pull request #10731 from ttuegel/plasma-5.4
KDE Plasma 5.4, Frameworks 5.15, and Applications 15.08
2015-11-04 10:06:28 -06:00
Eelco Dolstra 3e44182487 Merge remote-tracking branch 'origin/systemd-219' into staging 2015-11-04 15:37:28 +01:00
William A. Kennington III 4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Bjørn Forsman 27f41d8c0a 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
2015-11-03 16:32:31 +01:00
Franz Pletz d89f269b26 chrony service: Members of group chrony can use chronyc 2015-11-03 15:07:18 +01:00
Franz Pletz c459e269eb chrony service: Integration with other ntp daemons 2015-11-03 15:07:18 +01:00
Peter Simons 2bb705da15 postfix: don't create a symlink inside of /var/spool/mail if /var/mail exists already 2015-11-02 14:33:30 +01:00
Bjørn Forsman f25b36df3c nixos/jenkins: force .war (re)extraction at start-up
Or else we might run stale Jenkins.
2015-11-02 10:31:13 +01:00
Nikolay Amiantov 7487aba1a8 manual: document nginx changes 2015-11-02 01:15:48 +03:00
Luca Bruno ff02152def nixos/postgresql: fix extraPlugins example with a working one 2015-11-01 14:15:43 +01:00
Domen Kožar 581ae33e96 Merge pull request #10107 from ryantm/calibre-server
calibre-server service: init
2015-11-01 09:19:03 +01:00
Ryan Mulligan 922bf3986b calibre-server service: add type to libraryDir option 2015-10-31 14:21:56 -07:00
Benno Fünfstück d767aae721 sddm module: support autologin configuration 2015-10-31 16:04:52 +01:00
Thomas Tuegel 95725b2581 nixos/kde5: install oxygen-icons 2015-10-31 08:48:54 -05:00
Thomas Tuegel 5e65741e41 nixos/kde5: install a more complete desktop 2015-10-31 08:48:53 -05:00
Thomas Tuegel b4b2e7c23d nixos/kde5: install dolphin-plugins 2015-10-31 08:48:49 -05:00
Tim Jäger 4591e72917 Fixed wrong documentation for Wake-On-LAN feature 2015-10-31 12:55:34 +01:00
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Thomas Tuegel b36c2dd0a0 nixos/kde5: install frameworkintegration 2015-10-30 16:10:37 -05:00
Thomas Tuegel 88b99f0054 nixos/kde5: install oxygen-icons 2015-10-30 16:10:37 -05:00
Thomas Tuegel 5df5e1f165 plasma54: propagate packages to user profile 2015-10-30 16:10:37 -05:00
Thomas Tuegel 2386bd7c61 nixos/kde5: refine Phonon backend options 2015-10-30 16:10:37 -05:00
Thomas Tuegel 5d4950a02c nixos/kde5: only install required packages 2015-10-30 16:10:37 -05:00
Thomas Tuegel 80670a2d13 nixos/environment: don't set Qt 5 paths 2015-10-30 16:10:37 -05:00
Thomas Tuegel b102fa5a07 nixos/kde5: ready for plasma-5.4 2015-10-30 16:10:37 -05:00
Eelco Dolstra 81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Eelco Dolstra d9d5c98c56 Add option environment.enableDebugInfo
This makes the debug outputs of packages that have them available to
programs like gdb.
2015-10-30 15:21:16 +01:00
Eelco Dolstra c20403631d Factor out "man" into a separate module and add "man" outputs to system.path
Fixes #10270.
2015-10-30 15:21:12 +01:00
Eelco Dolstra 58e9440b89 Add option to link additional package outputs into system.path
This is necessary to get stuff like separate manpages, info files,
debug symbols, etc.
2015-10-30 15:21:02 +01:00
Eelco Dolstra 3e732f65cb Remove gnutar man page hack
It's no longer needed since the gnutar package contains a (much more
extensive) man page.
2015-10-30 15:20:15 +01:00
Nikolay Amiantov 00f79aab90 Merge pull request #10464 from abbradar/encrypted-swap
nixos/swap: refactor, add randomEncryption option
2015-10-30 11:49:46 +03:00
Domen Kožar 01b0355140 nm-openvpn: add user/group, closes #10689
(cherry picked from commit 551dad3ffd)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-29 09:59:08 +01:00
Benno Fünfstück a92c024c7f sddm: allow extra config options 2015-10-28 22:04:40 +01:00
Peter Simons 84903a4846 nixos: use "example.net" host name in autossh documentation 2015-10-28 20:04:36 +01:00
Peter Simons b8dd60aaa6 nixos: remove redundant services.autossh.enable option
The service is enabled automatically when 'session' is non-empty.
2015-10-28 19:50:06 +01:00
Peter Simons be1fa3c9da Merge pull request #10650 from grwlf/autossh-nixos
autossh.nix: AutoSSH service as a NixOS module
2015-10-28 11:31:51 +01:00
Sergey Mironov d355ed81cb autossh.nix: add the module, which run autossh sessions as systemd services 2015-10-28 00:23:13 +03:00
Arseniy Seroka 42eabf1c4a Revert "i3wm: Add debug & logging options" 2015-10-27 13:40:04 +03:00
Arseniy Seroka 50f5122d72 Merge pull request #10635 from layus/i3log
i3wm: Add debug & logging options
2015-10-27 12:51:50 +03:00
Guillaume Maudoux eb46e0fc72 i3wm: Add debug & logging options 2015-10-26 22:33:11 +01:00
michael bishop b81f51cecf teamviewer: fix the expressions 2015-10-26 15:22:01 -03:00
Domen Kožar f1508b3a23 nova-image: use make-disk-image.nix 2015-10-26 16:16:45 +01:00
Gabriel Ebner 929e734f19 postfix: 2.11.5 -> 3.0.3 2015-10-26 11:46:17 +01:00
Joachim Fasting 7b2b366552 nixos: set scsi link power policy using udev
Also improve option type checking by enumerating valid policy names.
2015-10-25 19:38:53 +01:00
aszlig 60d407b209
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>
2015-10-25 16:05:14 +01:00
Arseniy Seroka a5c0aec680 Merge pull request #10586 from dezgeg/pr-arm-tweaks
nixos: Minor improvements to ARM image expressions
2015-10-25 04:31:03 +03:00
Arseniy Seroka 61910861dc fix spelling 2015-10-25 04:26:49 +03:00
Tuomas Tynkkynen 7671f920f8 ARM: Use linuxPackages_latest in ARMv7 image
4.2 is out now, which includes the pcDuino3 Nano DTB.
2015-10-24 17:32:21 +03:00
Tuomas Tynkkynen 63c3aed442 ARM: Don't disable manual in installation images
Since commits 89e9837 and 5b8dae8 the manual no longer depends on
evaluation of any packages from nixpkgs, so all errors of the form
"Package 'foo' is not supported on 'armv7l-linux'" are gone.
2015-10-24 17:25:55 +03:00
Domen Kožar 6fb7b9b664 networkmanager: don't check if subject is active (false in my X session)
(cherry picked from commit 4c2bbb248c)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-10-23 20:16:49 +02:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Nikolay Amiantov 763ad3372a nixos/parsoid: use nodejs 0.10 2015-10-22 14:34:02 +03:00
Nikolay Amiantov a9792367aa Merge pull request #10390 from abbradar/bash-tramp
nixos/bash: use simple prompt for dumb terminals
2015-10-22 14:07:19 +03:00
Nikolay Amiantov 7a9982d465 nixos/bash: use simple prompt for dumb terminals 2015-10-22 14:05:49 +03:00
Nikolay Amiantov de8b8b35a4 nixos/swap: refactor, add randomEncryption option 2015-10-20 15:56:12 +03:00
Hajo Möller de9e05153d service.asterisk: fix dir creation 2015-10-19 19:05:23 +02:00
Nikolay Amiantov 12fcfe39db nixos/luksroot: allow to enter passphrase from another console 2015-10-18 18:41:11 +03:00
Nikolay Amiantov 1bd3d9de2a nixos/luksroot: use 'nuke-refs -e' option to simplify things 2015-10-18 18:41:11 +03:00
Nikolay Amiantov c81fb457c9 nixos/initrd-network: add new module 2015-10-18 18:41:11 +03:00
Nikolay Amiantov 8f967a3056 nixos/stage-1: add postEarlyDeviceCommands hook 2015-10-18 18:41:10 +03:00
Brian McKenna 3ef956eb50 nixos-generate-config: look at mmc_host for device drivers
I needed to add sdhci_acpi and mmc_block to my initrd modules in order to boot
my Chromebook. Looking under /sys/class/mmc_host/*/device/driver/module will
give us the sdhci_acpi dependency.
2015-10-16 17:41:15 +11:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Charles Strahan cb38f10d12 nixos-generate-config: detect brcmfmac requirement
This makes the firmware available (or would, if someone switched off
enableAllFirmware). Corresponding kernel module should get auto-loaded.

See #9948. Close #9971.
2015-10-15 13:12:42 +02:00
Eelco Dolstra 5f077e2296 Factor out option renaming
Option aliases/deprecations can now be declared in any NixOS module,
not just in nixos/modules/rename.nix. This is more modular (since it
allows for example grub-related aliases to be declared in the grub
module), and allows aliases outside of NixOS (e.g. in NixOps modules).

The syntax is a bit funky. Ideally we'd have something like:

  options = {
    foo.bar.newOption = mkOption { ... };
    foo.bar.oldOption = mkAliasOption [ "foo" "bar" "newOption" ];
  };

but that's not possible because options cannot define values in
*other* options - you need to have a "config" for that. So instead we
have functions that return a *module*: mkRemovedOptionModule,
mkRenamedOptionModule and mkAliasOptionModule. These can be used via
"imports", e.g.

  imports = [
    (mkAliasOptionModule [ "foo" "bar" "oldOption" ] [ "foo" "bar" "newOption" ]);
  ];

As an added bonus, deprecation warnings now show the file name of the
offending module.

Fixes #10385.
2015-10-14 18:18:47 +02:00
Eelco Dolstra a0d7a458b1 Don't block releases on nixos.tests.gnome3.i686-linux
http://hydra.nixos.org/build/26702440

Issue #10353.
2015-10-14 13:55:43 +02:00
Pascal Wittmann 78b2851724 Merge pull request #10384 from robbinch/fix-statd
Fix typo in nixos/modules/tasks/filesystems/nfs.nix.
2015-10-14 10:49:52 +02:00
Robbin C 528ebb4e5e Fix typo in nixos/modules/tasks/filesystems/nfs.nix.
statd should be cfg.statd.
2015-10-14 08:48:34 +08:00
Tobias Geerinckx-Rice a65cf63f55 copy-com service: order after network-online.target
I doubt that ordering non-sysvinit services after network.target ever
makes sense. In this case, CopyConsole requires DNS lookups and fails
if these are not yet possible.
2015-10-13 21:02:01 +02:00
aszlig e4caf0fde0
nixos/synergy: Restart services on failure.
Synergy seems to get more and more unstable in recent versions, so we
might want to debug this properly. However, it makes sense to restart
the service nevertheless, because synergy is about keyboard and mouse
sharing and it's quite annoying to either SSH in to restart the service
or even needing to unplug the keyboard and plug in into the machine with
the failing service.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-13 04:42:39 +02:00
Vladimír Čunát 91dced6ba0 nixos/manual: installation iso logs in automatically 2015-10-11 13:37:19 +02:00
Domen Kožar 49f5d85041 Merge pull request #10208 from offlinehacker/nixos/grafana/fix_option_name
grafana service: fix package option name
2015-10-08 12:21:58 +02:00
Eelco Dolstra 73f0d83858 systemd: Update to 227 2015-10-07 22:01:21 +02:00
Bjørn Forsman 04e748e61f 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).
2015-10-06 22:11:03 +02:00
Thomas Strobel c6b2365e9a supplicant module: extended module for wpa_supplicant
Add new configuration options for wpa_supplicant and allow to
configure and start one wpa_supplicant per device.
2015-10-06 20:12:40 +02:00
Thomas Strobel d5604f0b22 power management: restart post-resume.target on resume
Trigger a restart of the post-resume.target on resume.
That allows other systemd services to receive the restart signal
after resume by becoming 'partOf' the post-resume.target.
2015-10-06 20:12:40 +02:00
Thomas Strobel acb1b3cdd0 networking module: wlanInterfaces: fix file name of udev rules 2015-10-06 20:12:39 +02:00
Thomas Strobel 881ec1efb8 networking module: vswitches: re-structure dependencies to systemd units 2015-10-06 20:12:39 +02:00
Thomas Strobel 7a8980193d nixos grub: trustedBoot: introduce safety check that TPM is available 2015-10-06 20:12:39 +02:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Eelco Dolstra 106738b196 Give more memory for the disk image builder
http://hydra.nixos.org/build/26480662
2015-10-06 15:03:26 +02:00
Domen Kožar a61e26a63d Merge pull request #10227 from bjornfor/jenkins-envvars
nixos/jenkins: rework environment handling
2015-10-06 13:38:55 +02:00
lethalman 241821cbb4 Merge pull request #10195 from cleverca22/master
build the crontab localy, there is nothing to gain from building it remotely
2015-10-06 11:01:56 +02:00
Luca Bruno eccd68eeb7 gnome3: add bgSupport=true. Closes #10242 2015-10-06 10:21:38 +02:00
Mathnerd314 faa82a676b gnome3 test: increase timeout
The gnome3 test has been failing recently ([1](http://hydra.nixos.org/build/26608126/nixlog/1/raw) [2](http://hydra.nixos.org/build/26605926/nixlog/1/raw)); this is due to exit code 124 which is [the command timing out](https://www.gnu.org/software/coreutils/manual/html_node/timeout-invocation.html).

This increases the timeout to 900, to align with the similar timeout in https://github.com/NixOS/nixpkgs/blob/master/nixos/lib/test-driver/Machine.pm#L222
2015-10-05 22:10:40 -06:00
Eelco Dolstra e65b8fcebe Fix nixos-upgrade 2015-10-05 09:26:30 +02:00
Bjørn Forsman 67723df930 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.
2015-10-04 20:04:00 +02:00
Bjørn Forsman 5f17aeb403 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.
2015-10-04 14:34:38 +02:00
Bjørn Forsman 424e6e501a nixos/modules: simplify pkgs.zfs handling
Thanks, @lethalman.
2015-10-04 14:31:16 +02:00
Casey Ransom 791b600aac 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 ';']
2015-10-04 14:13:56 +02:00
Thomas Strobel d286ac5887 networking module: restructure wlanInterfaces
Restructure internals of networking.wlanInterfaces option to generate
proper '.device' systemd targets for the WLAN interfaces.
2015-10-04 11:00:05 +02:00
Jaka Hudoklin 8a63ae526f add support for auto format, format options 2015-10-04 03:15:29 +02:00
Jaka Hudoklin f660729e35 grafana service: fix package option name 2015-10-03 15:26:14 +02:00
Ryan Mulligan a41d07074d calibre-server service: configuration improvements
based on @eldostra feedback:
* remove user and group configuration, because it is probably
  unnecessary
* remove libraryDir default
* capitalize and shorten service description
2015-10-03 05:48:46 -07:00
michael bishop 54fe2f8c5c build the crontab localy, there is nothing to gain from building it remotely 2015-10-03 03:33:13 -03:00
William A. Kennington III 2ef6508c7f Merge branch 'master.upstream' into staging.post-15.06 2015-10-02 12:41:09 -07:00
Gabriel Ebner 0dfddc5a54 opensmtpd: support filters. 2015-10-02 13:01:50 +02:00
Thomas Strobel 213bb58752 networking module: fix for wlanInterfaces 2015-10-02 12:16:20 +02:00
lethalman 0474cb3c6d Merge pull request #10078 from nmikhailov/nm_service
Enable setting extended NetworkManager hooks
2015-10-02 11:45:28 +02:00
William A. Kennington III 98172435f7 Merge branch 'master.upstream' into staging.upstream 2015-10-01 10:43:44 -07:00
Thomas Strobel 6dfb16730b networking module: fix DocBook tags 2015-10-01 17:50:42 +02:00
Thomas Strobel c0248c0c1f networking module: init 'wlanInterfaces' option
Configuration option for setting up virtual WLAN interfaces.

If the hardware NIC supports it, then multiple virtual WLAN interfaces can be
configured through the options of the new 'networking.wlanInterfaces' module.
For example, the following configuration transforms the device with the persistent
udev name 'wlp6s0' into a managed and a ad hoc device with the device names
'wlan-managed0' and 'wlan-adhoc0', respectively:

networking.wlanInterfaces = {
    "wlan-managed0" = {
        type = "managed";
        device = "wlp6s0";
    };
    "wlan-adhoc0" = {
        type = "ibss";
        device = "wlp6s0";
    };
};

Internally, a udev rule is created that matches wlp6s0 and runs a script which adds
the missing virtual interfaces and re-configures the wlp6s0 interface accordingly.
Once the new interfaces are created by the Linux kernel, the configuration of the
interfaces is managed by udev and systemd in the usual way.
2015-10-01 15:35:30 +02:00
Eelco Dolstra b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
Luca Bruno e9b3a4f7c4 rl-1509.xml: Gnome -> GNOME 2015-10-01 12:53:27 +02:00
Eelco Dolstra ab16b6a837 Merge pull request #10160 from dezgeg/pr-unset-build-hook-in-nixos-install
nixos-install: Don't use NIX_BUILD_HOOK from caller's environment
2015-09-30 23:33:07 +02:00
William A. Kennington III e7bb9e1023 Merge branch 'master.upstream' into staging.upstream 2015-09-30 13:26:04 -07:00
Tuomas Tynkkynen 725a4d6740 nixos-install: Don't use NIX_BUILD_HOOK from caller's environment
If nixos-install is run on a machine with `nix.distributedBuilds = true`
the installation will fail at some point like this:

Died at /nix/store/4frhrl31cl7iahlz6vyvysy5dmr6xnh3-nix-1.10/libexec/nix/build-remote.pl line 115, <STDIN> line 1.

This is due to `nix.distributedBuilds` setting
NIX_BUILD_HOOK=/nix/store/.../build-remote.pl in the global environment,
which then gets confused in the minimal chroot created by nixos-install.

To avoid these kinds of issues with build hooks, just disable them in
the chroot.
2015-09-30 23:02:21 +03:00
Domen Kožar aca373c6b2 typos 2015-09-30 21:26:41 +02:00
Domen Kožar 82379b9f48 Merge pull request #10159 from nbp/doc-6794
Add pkgs module argument documentation for #6794 incompatible change.
2015-09-30 21:20:28 +02:00
Nicolas B. Pierron 50146ce815 Add pkgs module argument documentation for #6794 incompatible change. 2015-09-30 21:13:42 +02:00
Eelco Dolstra 3231424c37 Bump fallback Nix store paths 2015-09-30 21:12:46 +02:00
Eelco Dolstra 5374c07c15 Tweak release notes 2015-09-30 19:30:07 +02:00
Domen Kožar 187854fced update release notes for 15.09
(cherry picked from commit e13b657670)
2015-09-30 19:28:16 +02:00
Rickard Nilsson c0a83cbc49 opentsdb nixos module: Add option for defining OpenTSDB's configuration 2015-09-30 18:31:27 +02:00
Luca Bruno c6d77eb0bf nixos/tests/gnome3: wait for gnome shell to be started, for a better screenshot 2015-09-30 18:29:51 +02:00
Peter Simons ece50d57ce rl-1509.xml: update Haskell-related release notes
- Update the link to the manual to refer to the proper place.
 - Mention LTS Haskell and Stackage Nightly.
 - Minor cosmetic to improve readability.
2015-09-30 16:17:05 +02:00
ts468 1ddc1cdcf2 Merge pull request #10076 from ts468/upstream.systemd
systemd module: add option to specify generators
2015-09-30 15:12:43 +02:00
William A. Kennington III 271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Eelco Dolstra 9008c9cd5f Hack to parallelize AMI copying 2015-09-29 14:54:12 +02:00
Eelco Dolstra d06fdade6f Tweak AMI script 2015-09-29 14:54:12 +02:00
Eelco Dolstra 0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
Thomas Strobel 05c46bfc05 systemd module: add option to specify generators
Adding the configuration option 'systemd.generators' to
specify systemd system-generators. The option allows to
either add new system-generators to systemd, or to over-
ride or disable the system-generators provided by systemd.

Internally, the configuration option 'systemd.generators'
maps onto the 'environment.etc' configuration option.
Having a convenience wrapper around 'environment.etc' helps
to group the systemd system-generator configuration more
easily with other 'systemd...' configurations.
2015-09-29 11:53:25 +02:00
Peter Simons 4578784820 nixos: add services.bind.extraConfig option
This option allows users to add arbitrary configuration statements into
the generated named.conf file.
2015-09-29 11:51:40 +02:00
ts468 6d5a742c2e Merge pull request #10000 from ts468/upstream.vswitch
nixos networking: add vswitch option
2015-09-29 00:52:58 +02:00
Eelco Dolstra cab1483a95 Blacklist the xen_fbfront kernel module
This gets rid of a 30 second delay during boot. See e.g
https://github.com/coreos/bugs/issues/208.
2015-09-28 22:15:47 +02:00