Commit graph

7786 commits

Author SHA1 Message Date
Silvan Mosberger cf07fc6b16 luksroot: fix typo 2017-07-02 04:37:51 +02:00
Joachim F 4e548d2717 Merge pull request #26964 from romildo/upd.lumina
lumina: 1.2.0-p1 -> 1.3.0
2017-07-01 12:51:14 +01:00
Jörg Thalheim 343ad1697d Merge pull request #26897 from layus/nixos-terminfo
terminfo: symlink terminfo to /etc for ncurses
2017-07-01 09:27:24 +01:00
Johannes Frankenau 0dd204ebfe mpd service: Create playlist directory 2017-07-01 09:13:49 +02:00
Joachim F 74b3a8f5ae Merge pull request #26541 from dermetfan/browserpass
browserpass: 2017-04-11 -> 1.0.5
2017-06-30 20:58:37 +01:00
Joachim F a8ba50db3e Merge pull request #26492 from michalpalka/new-xen
xen_4_8: init at 4.8.1
2017-06-30 20:27:04 +01:00
Graham Christensen 5fd4ae36e2
nixos release-combined: only build zfsroot tests on x86_64-linux 2017-06-30 15:21:30 -04:00
Vladimír Čunát ddf864f8aa
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
2017-06-30 18:16:58 +02:00
Volth a1212c7784 collectd service: removed insecure AmbientCapabilities 2017-06-30 11:57:46 +00:00
Robin Stumm 4540eaf578 browserpass: 2017-04-11 -> 1.0.5 2017-06-30 13:32:45 +02:00
Guillaume Maudoux bd562949cf terminfo: symlink terminfo to /etc for ncurses 2017-06-30 11:17:11 +02:00
Jörg Thalheim 1266c8f935 Merge pull request #26967 from florianjacob/fix-systemd-resolved-nsswitch-loading
Fix systemd resolved nsswitch loading and clearly state NSS module's dependency on nscd
2017-06-30 09:26:18 +01:00
Volth 67340baa9b collectd service: minor refactoring
* removed pid-file support, it is needless to run collectd as systemd service
* removed static user id, as all the files reowned on the service start
* added ambient capabilities for ping and smart (hdd health) functions
2017-06-30 00:52:22 +00:00
Florian Jacob e370e97f3d nsswitch: only add modules to nsswitch.conf if they can be loaded 2017-06-30 02:44:23 +02:00
Florian Jacob 7410b0c82c nsswitch: add assertions for enabled nscd 2017-06-30 02:44:22 +02:00
Florian Jacob 63fa3e7c62 nsswitch: fix typo specifying nss-resolve module
this had the effect of not being able to load nss-resolve
and falling back to dns module in all cases.
2017-06-30 02:40:49 +02:00
Graham Christensen 8ca805d02f Merge pull request #26940 from grahamc/nixos-manual
NixOS Manual: Make it easier to debug
2017-06-29 19:45:16 -04:00
Volth 99b8d5ebe6 lighttpd: add collectd submodule 2017-06-29 22:41:22 +00:00
Volth 68bf28adaf vault: services.vault.storagePath for the file backend 2017-06-29 21:10:56 +00:00
Graham Christensen 1eb979db0e
nixos manual: combine XML and validate separately 2017-06-29 11:25:03 -04:00
romildo c5ff68b3c2 lumina: 1.2.0-p1 -> 1.3.0
- Update to version 1.3.0

- Remove dependency on `oxygen-icons5`, as Lumina desktop now distributes
it’s own "material-design-[light/dark]" icon themes and uses them as the
default icon sets.
2017-06-29 08:13:09 -03:00
Graham Christensen 4f3f926906
nixos manual: Remove trailing newline in version XML 2017-06-28 19:58:06 -04:00
Graham Christensen 425e9ce493 Merge pull request #26917 from grahamc/zfs-installer-test
nixos: installer.nix test: test ZFS install use case
2017-06-28 19:47:14 -04:00
Graham Christensen b0a4c2c33f
nixos: installer.nix test: test ZFS install use case 2017-06-28 19:45:20 -04:00
John Ramsden 9f4c3b2efd
Add keyring enable option and add Nylas to systemPackages 2017-06-28 16:13:10 -07:00
John Ramsden 3fddb48020
Add Nylas mail module. Still needs keyring configuration 2017-06-28 15:56:41 -07:00
Volth 2056c7e395 removed generation of self-signed certificate 2017-06-28 22:22:53 +00:00
Volth 519f17035f vault: add unitConfig.RequiresMountsFor to systemd config 2017-06-28 21:16:04 +00:00
aszlig e82d126212
nixos/xserver: Don't use exec in xkb-layouts-exist
First of all, thanks to @pbogdan for getting this problem reproduced:

https://github.com/NixOS/nixpkgs/commit/2014db3efcd2a#commitcomment-22815396

Also thanks to @vcunat for bringing this to my attention:

https://github.com/NixOS/nixpkgs/commit/44c64fef16ed5#commitcomment-22813503

Although it is not entirely clear why Nix has killed the build prior to
finishing, it seems to be related to the process substition I was using.

So instead of using "exec touch", let's wrap this inside an if so we
don't exit too early.

Tested this against all sub-tests in nixos/tests/keymap.nix and also a
few configurations with wrong keyboard layout definitions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-28 21:39:19 +02:00
Vladimír Čunát 2014db3efc
nixos xkb-layouts-exist: try to debug on Hydra
I hate having to do this.  We're unable to reproduce the problem locally.
2017-06-28 19:47:51 +02:00
Rickard Nilsson a6cf6367e2 network-manager: hostname option is deprecated
From log:
<warn>  [1498639184.8965] keyfile: 'hostname' option is deprecated and has no effect
2017-06-28 10:56:31 +02:00
Volth 7330e80456 vault: start after consul if consul is used as storage backend 2017-06-28 00:58:19 +00:00
Volth d016ef1f5b create directory only for "file" storage 2017-06-27 20:22:53 +00:00
Joachim F 767a8b2e9a Merge pull request #26073 from florianjacob/piwik-package
piwik & piwik service: init at 3.0.4
2017-06-27 20:51:16 +01:00
Volth 4c428b4a6f vault: run as an unpivileged user 2017-06-27 19:34:12 +00:00
Katyucha cad450e6d6 delete lines 2017-06-27 19:34:12 +00:00
Katyucha 442f76d72a Vault: 0.6.5 -> 0.7.2 with services 2017-06-27 19:34:12 +00:00
Joachim F 8791cad96b Merge pull request #26598 from moretea/mysql-add-bind-option
mysql module: add option to bind to an address
2017-06-27 19:43:41 +01:00
Domen Kožar 4dadb12a63
hydra: restart daemons on config change
https://github.com/NixOS/hydra/pull/491
2017-06-27 17:09:13 +02:00
Michał Pałka 9e6bfbb2f9 xen_4_8: init at 4.8.1
This commit adds the xen_4_8 package to be used instead of
xen (currently at 4.5.5):
 * Add packages xen_4_8, xen_4_8-slim and xen_4_8-light
 * Add packages qemu_xen_4_8 and qemu_xen_4_8-light to be used
   with xen_4_8-slim and xen_4_8-light respectively.
 * Add systemd to buildInputs of xen (it is required by oxenstored)
 * Adapt xen service to work with the new version of xen
 * Use xen-init-dom0 to initlilise dom0 in xen-store
 * Currently, the virtualisation.xen.stored option is ignored
   if xen 4.8 is used
2017-06-27 12:01:53 +00:00
Calvin Cheng 3270545094 rethinkdb service: initial implementation 2017-06-27 02:09:15 +02:00
Franz Pletz 271d3f7a43
prometheus service: globalConfig.labels is obsolete
Due to the version bump in e60c958811.
2017-06-27 01:53:03 +02:00
Peter Simons 003cd41310 zsh: extend default $fpath configured by NixOS to find "vendor-completions" 2017-06-26 10:50:52 +02:00
tv ea44ca47f3 security-wrapper: run activation script after specialfs
Ensures that parentWrapperDir exists before it is used.

Closes #26851
2017-06-26 09:26:16 +02:00
Christian Albrecht 3584707638
nixos/boot/stage-1: fix failing nixos-rebuild switch because of blkid output
old version of blkid used to output version information including libblkid version
when invoked with --help parameter

new version does not output libblkid version when invoked with --help parameter

fix is to invoke blkid with -V parameter to output version including libblkid in both cases
2017-06-26 09:15:44 +02:00
Pascal Bach aa66c9ad37 minio service: add inital service
features:
- change listen port and address
- configure config and data directory
- basic test to check if minio server starts
2017-06-26 04:07:37 +02:00
michael bishop bb16bced36
toxvpn: 20161230 -> 2017-06-25 2017-06-25 20:17:20 -03:00
Kai 9929e83607 systemd-boot-builder.py: add support for profiles (#26318)
* systemd-boot-builder.py: add support for profiles

This will also list the generations of other profiles than `system` in
the boot menu. See the documentation of the `--profile-name` option of
nixos-rebuild for more information on profiles.

* Fix errors introduced by previous commit
2017-06-24 20:33:34 +01:00
Daiderd Jordan c0cdf58807
plex: fix preStart permissions 2017-06-24 18:48:47 +02:00
Samuel Leathers 5d7fd7e7fa mailhog: init at 1.0.0 (#26821)
* mailhog: init at 1.0.0

* formatting nitpicks
2017-06-24 17:05:34 +01:00
André-Patrick Bubel d859769f26 nixos: replaced "userns" with "user namespaces" for clarity
"userns" wasn't introduces as an abbreviation elsewhere as far as I can see, and I wasn't sure what was meant at first.
2017-06-22 22:04:34 +02:00
Joachim Schiele 3d52203ab2 sshd.nix: Added nixops usage warning of openssh.authorizedKeys.keys usage 2017-06-22 11:50:09 +02:00
aszlig bcaf2f6dbe
nixos/tests/sddm: Fix detecting login screen
Tesseract seems to have a hard time detecting the "ALICE FOOBAR" text,
so let's match on "Select your user and enter password" instead.

Ran the test on x86_64-linux and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-22 06:26:08 +02:00
aszlig 7a99036cef
nixos/release-combined: Add keymap tests
We really want to break channel updates whenever we break something like
this, because this actually will hit machines out there and can be very
much annoying (we had broken keymaps a few times which is why I
introduced these tests in the first place).

Just to be sure I don't break channel updates with this commit, I ran
all of the keymap tests and they all succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-06-22 03:33:35 +02:00
aszlig 44c64fef16
nixos/xserver: Improve checking keyboard layout
Enumerating the symbols directory doesn't include variants, so we're now
basically doing what "localectl list-x11-keymap-layouts" does but we use
sed instead.

The reason I'm not using localectl directly is because the path to
rules/base.lst is hardcoded in the systemd source.

Of course, the XKB specification allows for much more complicated rules,
but at least this should cover the most basic ones including variants.

So the sed expression itself is just for listing the available layouts
and variants and we use a grep with -xF to match only full lines without
interpreting regular expressions.

This should again allow to set "dvorak" as the layout option.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann
Fixes: #25526
2017-06-22 03:24:28 +02:00
Graham Christensen dd265313e7 Merge pull request #26736 from grahamc/improve-nixos-test-debug
Improve nixos test debug
2017-06-21 17:26:18 -04:00
Domen Kožar 7bd918b364
hydra-evaluator: depend on jq 2017-06-21 15:35:07 +02:00
Graham Christensen 3f40fcabbf
nixos tests: waitForWindow: output a list of windows we see prior to the final check
machine: must succeed: xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'
    machine: exit status 0
    machine: Last chance to match /(?^:dfiirst configuration)/ on the the window list, which currently contains:
    machine: [i3 con] container around 0xf8a5f0, i3: first configuration, [i3 con] floatingcon around 0xf8c260, [i3 con] container around 0xf8a380, i3bar for output Virtual-1, [i3 con] bottom dockarea Virtual-1, [i3 con] workspace 1, [i3 con] content Virtual-1, [i3 con] top dockarea Virtual-1, [i3 con] output Virtual-1, [i3 con] workspace __i3_scratch, [i3 con] content __i3, [i3 con] pseudo-output __i3, i3
2017-06-20 21:16:35 -04:00
Graham Christensen 1b833015b7
nixos tests: waitForText: output the detected screen content prior to the last attempt
machine: Last chance to match /(?^:BALICE)/ on the screen, which currently contains:
    machine: performing optical character recognition
    machine: sending monitor command: screendump /tmp/nix-build-vm-test-run-sddm.drv-0/ocrin.ppm
    machine: Session Layout

    O O

    0 1 : 0 9

    Wednesday, June 21, 2017

    |_ I

    Select your user and enter password
2017-06-20 21:10:34 -04:00
Graham Christensen 348785eec0
nixos tests: waitUntilTTYMatches: Log TTY contents on last try
If the test has not passed yet, on the last attempt it now outputs:

    machine: Last chance to match /logine: / on TTY2, which currently contains:
    machine: running command: fold -w$(stty -F /dev/tty2 size | awk '{print $2}') /dev/vcs2
    machine: exit status 0
    machine:

    <<< Welcome to NixOS 17.09.git.a804ef4 (x86_64) - tty2 >>>

    machine login:

to help debug the problem. Notice the "logine" typo in my check.
2017-06-20 20:57:39 -04:00
Graham Christensen 56435c1404
nixos tests: retry: Count down to 0, and pass remaining attempts to the sub
Allows test functions to output diagnostic information on failure.
2017-06-20 20:54:33 -04:00
Eelco Dolstra 5446934b41
nix: 1.11.10 -> 1.11.11
(cherry picked from commit 7b1e936b24)
2017-06-19 19:03:39 +02:00
Florian Jacob 55844c8380 piwik & piwik service: init at 3.0.4 2017-06-19 16:00:17 +02:00
Franz Pletz ba1330b12e Merge pull request #26605 from mayflower/disable-ssh-agent
ssh module: disable agent by default
2017-06-18 22:03:59 +02:00
Jörg Thalheim 96eaad8fd4 Merge pull request #26697 from kirelagin/nsd-stderr
nsd: Send stderr to /dev/null
2017-06-18 16:53:36 +01:00
Jörg Thalheim f36cdf1171 Merge pull request #26675 from kirelagin/bind-rndc
bind: Use rndc to control the daemon
2017-06-18 16:30:02 +01:00
Kirill Elagin 13d026e219 bind: Use rndc to control the daemon 2017-06-18 17:29:29 +03:00
Thomas Tuegel dab7700f6c
qt58: determine plugin and import paths from PATH
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
2017-06-18 08:44:47 -05:00
Thomas Tuegel faf0d3e91d
kdeFrameworks: fixup inputs and outputs
- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
2017-06-18 08:44:45 -05:00
Thomas Tuegel 870c07cc2b
sddm: take themes from system environment 2017-06-18 08:43:39 -05:00
Thomas Tuegel be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
Thomas Tuegel 3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
Kirill Elagin e66d2753f3 nsd: Send stderr to /dev/null
nsd by default logs _both_ to syslog and to standard error which results
in all the messages ending up in the journal twice, the ones from stderr
with an ugly timestamp sticked in front of them.
2017-06-18 15:31:34 +03:00
Manuel Bärenz 858c47c18e Manual: Add paragraph on xserver keyboard layout 2017-06-17 21:37:25 +02:00
Joachim F 0b7c4c1900 Merge pull request #26170 from kirelagin/wlan-fix
wirelessInterfaces: Add a missing parameter
2017-06-17 15:31:22 +01:00
Vladimír Čunát c416641d4d
Merge #26657: nixos security.wrappers: fix a typo
Fixes #26611.
2017-06-17 10:00:52 +02:00
Niklas Hambüchen aa645b51ba jenkins service: Add extraJavaOptions.
This is useful for the common case of passing arguments to
the JVM that runs Jenkins.
2017-06-16 09:23:11 +02:00
Parnell Springmeyer 5ca644c228
Fixing attribute name mistake: setguid => setgid 2017-06-15 19:25:43 -07:00
Roger Qiu 1b6176e45b gnupg module: Added extra and browser sockets (#26295)
Also added dirmngr and made SSH support false by default
due to programs.ssh.startAgent defaulting to true.
2017-06-15 19:40:09 +02:00
Franz Pletz 994ffc01a0
ssh module: disable agent by default 2017-06-15 19:27:01 +02:00
Maarten Hoogendoorn d847b5c763 mysql module: add option to bind to an address 2017-06-15 16:08:15 +02:00
Ekaterina Vaartis c0df448d54 apache-httpd: fix mod_perl by refering to apacheHttpdPackages (#26579) 2017-06-15 13:07:14 +02:00
Pascal Bach c9802321c1 cntlm service: cleanup non working config options (#26578)
- extraConfig was not working
- add possibility to add cntlm.conf in verbatime form
- create cntlm user as system user
- add no proxy option
2017-06-15 12:11:48 +02:00
Edward Tjörnhammar 3dcecf09fc
Remove aiccu package and service due to sunsetting.
https://www.sixxs.net/main/
2017-06-15 06:58:08 +02:00
Joachim Schiele ca17f3b8ef hostapd dependency fix for https://github.com/nixos/nixpkgs/issues/16090 (#26573) 2017-06-14 16:44:46 +02:00
Maximilian Bosch 3803864ca6 thefuck: init at 3.18 (#26529) 2017-06-14 09:57:38 +01:00
Joachim F 631ec734eb Merge pull request #26460 from romildo/fix.nixos-artwork
nixos-artwork: add more wallpapers
2017-06-13 23:20:52 +01:00
Bas van Dijk 2444eab485 ELK: update kibana and the elastic beats to 5.4 (#26252)
* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
  (see elk5Version)
* Add a test for the ELK stack
2017-06-13 22:36:08 +02:00
Taylor "Nekroze" Lawson 9fb87f9c9d Kubernetes ABAC policy file fix (#26499)
Fix the incorrect nix map that generates the Kubernetes policy file
2017-06-13 21:54:36 +02:00
Franz Pletz ac5258edb2
caddy service: don't use extra dotdir in dataDir 2017-06-13 21:21:59 +02:00
Franz Pletz 071815cb24
caddy service: sync with upstream systemd unit
Increases security and fixes minor issues.
2017-06-13 21:21:59 +02:00
Joachim F 76430ecd9f Merge pull request #25701 from mayflower/elasticsearch_postStart_script_removal
elasticsearch service: remove postStart script
2017-06-13 00:13:05 +01:00
Eelco Dolstra 0bffe03828
nix: 1.11.9 -> 1.11.10 2017-06-12 20:13:27 +02:00
Robin Gloster c5467a16c4
errbot module: needs network-online to connect properly 2017-06-12 17:44:42 +02:00
Jan Tojnar e35f3c0679
doc: Fix some typos 2017-06-11 22:13:42 +02:00
Vladimír Čunát 32916ab1de
Merge older staging
Enough rebuilds have finished on Hydra now.
2017-06-11 09:01:08 +02:00
Bjørn Forsman 5b48368386 nixos/bcache: add services.udev.packages = [ bcache-tools ]
Adds /dev/disk/by-{id,label}/* symlinks for bcache device nodes, in the
final rootfs.

Symlinks will only be created for bcache devices that contain
filesystems. So if you have a blank bcache device or run LVM on top of
bcache you will not get this kind of symlink.
2017-06-10 17:10:49 +02:00
Bjørn Forsman 581226cfb4 nixos/bcache: /bin/sh -> ${bash}/bin/sh
Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.
2017-06-10 17:10:49 +02:00
Benjamin Staffin 700e22f7bf nixos: Add support for scalable fonts in Grub menus (#26227)
The default font is unreadably small on some hidpi displays. This
makes it possible to specify a TrueType or OpenType font at any point
size, and it will automatically be converted to the format the Grub
uses.
2017-06-10 09:53:24 -04:00
Jörg Thalheim 9c0577447c Merge pull request #26191 from romildo/fix.mlocate
locate: fix creation of parent dir of database
2017-06-10 11:56:26 +01:00