3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

10114 commits

Author SHA1 Message Date
John Ericson d7144e708b Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 16:00:04 -04:00
markuskowa 96c81d2fdd beegfs/module: Fix a typo in meta.conf generation (#40979)
This typo places mgtmd.extraConf in meta.conf
leading to meta.extraConf being ignored.
2018-05-23 17:23:58 +02:00
John Ericson 18742471af Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
Sarah Brofeldt a23cf33223
Merge pull request #40778 from phile314/slimserver-fix
nixos/slimserver: Fix media scanning & transcoding
2018-05-23 13:03:59 +02:00
Philipp Hausmann 32bad1b636 nixos/slimserver: Disable broken image/video support (#40589) 2018-05-23 12:31:44 +02:00
Yegor Timoshenko 94b9ede523
Merge pull request #40806 from Mic92/nixos-ids
nixos/ids: information when to use static uids/gids
2018-05-23 12:24:59 +03:00
Yegor Timoshenko 332e8b4038
Merge pull request #39982 from tadfisher/scsi-link-policy
nixos/powerManagement: add "med_power_with_dipm" scsiLinkPolicy
2018-05-22 23:53:24 +03:00
Matthew Justin Bauer 009d4341d8
Merge pull request #40881 from hedning/flatpax-xdg-data-dirs
nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environment
2018-05-22 13:55:38 -05:00
Tuomas Tynkkynen f9feacfc7c Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
Robin Gloster a32b6d5c9a
networking.routes: static routes are proto static 2018-05-22 14:30:53 +02:00
Robin Gloster 852fa6b86f
home-assistant module: add openFirewall option 2018-05-22 14:29:57 +02:00
Kevin Liu b6f2e75d75
kubernetes-dashboard: raise memory limit to 250MB
On my cluster, I often get OOM errors that cause the dashboard to crash just by going over 50MB.
2018-05-21 21:07:24 -04:00
Tor Hedin Brønner 17e0e67930 nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environment
We use environment.profiles to add both the PATH and XDG_DATA_DIRS.
2018-05-22 02:26:21 +02:00
John Ericson db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
Yegor Timoshenko 5da85431fb
Merge pull request #40892 from NixOS/no-more-nixpkgs-symlink
Stop requiring the nixpkgs symlink in NixOS channel tarballs
2018-05-22 03:16:04 +03:00
xeji fe79fc0be4
nixos/tests/mysql-replication: fix test (#40850)
Failed non-deterministically on hydra because replcation
sometimes was not finished yet when checking the results.
2018-05-22 01:22:12 +02:00
Daniel Peebles 0598652303
Stop requiring the nixpkgs symlink in NixOS channel tarballs
Ideally I'd like the whole `nixos`/`nixpkgs` channel distinction to disappear, but this is a step along that path. After a while being in this state, we can stop creating the magic `nixpkgs -> .` symlink inside our `nixos` channel tarballs and simplify that whole mess a bit.
2018-05-21 16:41:03 -04:00
Samuel Leathers 5830b0381f
Merge pull request #40565 from etu/gitea-improvements
nixos/gitea: Enable configuring of derivation and a systemd timer for creation of backups
2018-05-21 07:16:05 -04:00
Maximilian Bosch 4db2d4d1fd nixos/xsslock: wait until pgrep xlock succeeds (#40810)
Please refer to the conversation in the original PR (#40619) for further
reference: https://github.com/NixOS/nixpkgs/pull/40619#issuecomment-390437845

It takes some time after the standby to trigger the locker which might
break the test on Hydra.
2018-05-20 20:59:53 +02:00
Vladimír Čunát 392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Jörg Thalheim 8c3503d6f6 nixos/ids: information when to use static uids/gids 2018-05-20 10:56:55 +01:00
Elis Hirwing ce42182d13
nixos/gitea: Add options to enable a timer with optional interval
This will run gitea dump and create a backup file for gitea every so
often as the interval is defined to do.
2018-05-20 10:49:24 +02:00
Elis Hirwing e166aee826
nixos/gitea: Allow customizing derivation to use 2018-05-20 10:49:23 +02:00
Samuel Leathers fef6b9ac0c
Merge pull request #40801 from xeji/test/dnscrypt-proxy
nixos/dnscrypt-proxy: fix apparmor profile and test
2018-05-19 21:11:17 -04:00
Uli Baum 8dbd8f4d69 nixos/dnscrypt-proxy: fix apparmor profile and test
Test failed because of an incomplete apparmor profile.
- fix apparmor profile
- improve test timing, prevent non-deterministic failure
2018-05-20 02:25:42 +02:00
xeji f4ec18aaac
nixos/cjdns: fix service for i686 (#40740)
service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686
2018-05-20 01:01:42 +02:00
Jörg Thalheim 8bcec815bd
Merge pull request #40744 from kirelagin/wireguard-darwin
WireGuard: Make tools available on other platforms
2018-05-19 22:49:54 +01:00
Robert Schütz 90c0100139 Merge branch 'master' into staging 2018-05-19 11:12:19 +02:00
xeji a0feedca8f
nixos/tests/nexus: fix for i686 (#40743)
test failed because qemu-system-i386 can only simulate 2047M RAM
(not 2048)
2018-05-19 11:09:07 +02:00
Gregor Kleen effb02131c Revert "zsh: move setEnvironment stuff to zprofile"
This reverts commit 77a6cbb1c1.
2018-05-19 10:17:41 +02:00
xeji 301072dc27 nixos/tests/hardened: fix test (#40745)
failed because `pgrep -u` segfaults when accesss to proc info
is denied on a hardened system.
2018-05-19 08:42:15 +02:00
Kirill Elagin 865abfa609
wireguard: Enable tools on other platforms
Wireguard is now split into two pretty much independent packages:
`wireguard` (Linux-specific kernel module) and `wireguard-tools`,
which is cross-platform.
2018-05-19 01:17:26 +03:00
John Ericson 5ccb99e372 Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 17:48:37 -04:00
Robert Schütz e3a7d55d3e
nixos/tests/home-assistant: ignore "Timer got out of sync" error (#40735) 2018-05-18 23:06:25 +02:00
Maximilian Bosch 641a623053 nixos/xss-lock: add module (#40619)
`xsslock` (which was originally packaged in 6cb1d1aaaf)
is a simple screensaver which connects a given screen locker (e.g.
`i3lock`) with `logind`. Whenever `loginctl lock-sessions` is invoked
the locker will be used to lock the screen. This works with its power
management features (e.g. `lid switch`) as well, so the PC can be locked
automatically when the lid is closed.

The module can be used like this:

```
{
  services.xserver.enable = true;

  programs.xss-lock.enable = true;
  programs.xss-lock.lockerCommand = "i3lock";
}
```
2018-05-18 18:24:53 +02:00
Philippe Grégoire 536a41171b
Remove all references to absent nixos-prepare-root
Fixes the broken 0f5d5970b2 commit.
2018-05-18 09:53:11 -04:00
Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
Jan Tojnar bd648f321c
nixos/nginx: emphasize that useACMEHost does not create certs
It was not entirely clean that `services.nginx.virtualHosts.<name>.useACMEHost` does not create certificates, see https://github.com/NixOS/nixpkgs/issues/40593
2018-05-17 20:48:02 +02:00
Tim Steinbach fe2deeb458
kafka: Add 1.1 2018-05-16 22:26:40 -04:00
John Ericson ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
Maximilian Bosch 70d64d129e nixos/statsd: refactor test (#40554)
`statsd` is a daemon written in `node` to gather statistics over UDP.
The current test ensures that a port is open, but the basic
functionality isn't sufficiently tested.

This patch contains the following changes:

* Simplified port scanning (`waitForOpenPort` rather than `netcat` magic).

* Issue a TCP command to check the health of the `statsd` server.

* Simple script to check if `statsd` receives data over UDP and confirms
  the basic functionality of the TCP interface on `8126` for admin
  purposes.
2018-05-16 18:03:55 +02:00
Andreas Rammhold 8a93595550
sysprof: 1.2.0 -> 3.28.1 2018-05-16 16:54:12 +02:00
Jan Tojnar 75cc398b97
Merge pull request #39615 from jtojnar/gdm-wayland
GDM wayland improvements
2018-05-16 16:39:12 +02:00
Jan Tojnar 54135fc733
gnome3.gdm: allow choosing user account without GNOME
Account chooser depends on AccountsService, which is normally enabled by
GNOME module but it was missing when using GDM without GNOME.
2018-05-16 16:25:22 +02:00
baroncharlus 380cdd8dd7 Add stubby resolver daemon service module (#38667)
* networking/stubby.nix: implementing systemd service module for stubby

This change implements stubby, the DNS-over-TLS stub resolver daemon.
The motivation for this change was the desire to use stubby's
DNS-over-TLS funcitonality in tandem with unbound, which requires
passing certain configuration parameters. This module implements those
config parameters by exposing them for use in configuration.nix.

* networking/stubby.nix: merging back module list

re-merging the module list to remove unecessary changes.

* networking/stubby.nix: removing unecessary capabilities flag

This change removes the unecessary flag for toggling the capabilities
which allows the daemon to bind to low ports.

* networking/stubby.nix: adding debug level logging bool

Adding the option to turn on debug logging.

* networking/stubby.nix: clarifying idleTimeout and adding systemd target

Improving docs to note that idleTimeout is expressed in ms. Adding the
nss-lookup `before' target to the systemd service definition.

* networking/stubby.nix: Restrict options with types.enum

This change restricts fallbackProtocol and authenticationMode to accept
only valid options instead of any list or str types (respectively). This
change also fixes typo in the CapabilityBoundingSet systemd setting.

* networking/stubby.nix: cleaning up documentation

Cleaning up docs, adding literal tags to settings, and removing
whitespace.

* networking/stubby.nix: fixing missing linebreak in comments

* networking/stubby.nix: cleaning errant comments
2018-05-16 15:16:30 +02:00
Matthew Justin Bauer 485fe9e766
Merge pull request #40223 from jD91mZM2/shouldnt-we-just-use-the-pam-environment-file-instead
zsh: move setEnvironment stuff to zprofile
2018-05-16 00:52:31 -05:00
Walter Franzini 205a9f2576 minor improvement to nix installation instructions (#40521)
* improve nix installation instructions

in the command

	$ bash <(curl https://nixos.org/nix/install)

<(..) is a bashism.  The documentation now show a command that does
not require to be executed by bash.
2018-05-16 00:23:00 -05:00
Peter Hoeg 7f27566efd
Merge pull request #40581 from peterhoeg/p/sedutil
sedutil: init at 1.15.1 and corresponding nixos module
2018-05-16 12:39:06 +08:00
Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Matthew Justin Bauer 2a3399b3c8
Merge pull request #39978 from hedning/plymouth-quit-wait
Make plymouth work with gdm wayland
2018-05-15 14:28:47 -05:00