about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge pull request #38263 from lopsided98/grub-initrd-secretsJoachim F2018-06-06
|\ | | | | grub: support initrd secrets
| * nixos/grub: support initrd secretsBen Wolsieffer2018-05-07
| |
* | nixos/release-combined: remove keymap tests from tested jobUli Baum2018-06-06
| | | | | | | | | | Temporary fix for #41538; non-deterministic failures blocked the release channel.
* | Merge pull request #40729 from nlewo/pr-hydra-testDaiderd Jordan2018-06-06
|\ \ | | | | | | nixos/tests/hydra: build a trivial derivation
| * | nixos/tests/hydra: add it in nixos/release.nixAntoine Eiche2018-06-06
| | |
| * | nixos/tests/hydra: build a trivial derivationAntoine Eiche2018-06-06
| | | | | | | | | | | | | | | | | | | | | A script is used to create a project, and configure a jobset. This jobset fetches a local file containing a trivial Nix expression. The test script makes sure this derivation has been successfully built by Hydra.
* | | Merge pull request #41342 from samueldr/fix/doc/formatting-oopsiesxeji2018-06-05
|\ \ \ | | | | | | | | Fixes doc auto-formatting oopsies
| * | | nixos/doc+man: Fixes squishedtogether definitions.Samuel Dionne-Riel2018-05-31
| | | |
| * | | nixos/doc: ran `make format`Samuel Dionne-Riel2018-05-31
| | | | | | | | | | | | | | | | With visual inspection that nothing got worse.
| * | | doc: Adds xml fixing script. (see previous and next commits)Samuel Dionne-Riel2018-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script is used to automatically fix issues within xml documentation files. The script is *for now* intended to be used ad-hoc, and the commits to be examined. A future discussion will define whether: * This commit and scripts are kept. * The script is extended for common use. The biggest issue right now with the script is that it *could* in theory destroy a valid space-less varlistentry. The script could, in practical use, be changed and extended to normalize some parts of the XML files, mainly: * A common quoting style for attributes * Fix-up some weird formatting automatically that xmlformat doesn't catch
| * | | doc: Adds rule to xmlformat to help keep spacing right.Samuel Dionne-Riel2018-05-31
| | | | | | | | | | | | | | | | | | | | The other definitions broke term, cmdsynopsis and arg tags; spaces inside were removed, making workdsrun-ininstead of keeping them spaced.
* | | | Merge pull request #41486 from grahamc/support-null-fontGraham Christensen2018-06-05
|\ \ \ \ | | | | | | | | | | grub: Support when boot.loader.grub.font is null
| * | | | install-grub: only try to loadfont if font is not nullGraham Christensen2018-06-05
| | | | |
| * | | | grub-config.xml: handle a null fontGraham Christensen2018-06-05
| | |/ / | |/| |
* | | | Merge pull request #41446 from aszlig/make-serviceconfig-overridableEelco Dolstra2018-06-05
|\ \ \ \ | |/ / / |/| | | nixos/systemd: Allow to override serviceConfig
| * | | nixos/systemd: Allow to override serviceConfigaszlig2018-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been reported by @qknight in his Stack Overflow question: https://stackoverflow.com/q/50678639 The correct way to override a single value would be to use something like this: systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no"; However, this doesn't work because the check is applied for the attrsOf type and thus the attribute values might still contain the attribute set created by mkOverride. The unitOption type however did already account for this, but at this stage it's already too late. So now the actual value is unpacked while checking the values of the attribute set, which should allow us to override values in serviceConfig. Signed-off-by: aszlig <aszlig@nix.build> Cc: @edolstra, @qknight
* | | | Merge pull request #41311 from AmineChikhaoui/fix-gce-fetch-sshRob Vermaas2018-06-04
|\ \ \ \ | | | | | | | | | | GCE image: properly remove the temporary ssh host keys files/directory
| * | | | avoid redundant rm callsAmineChikhaoui2018-06-04
| | | | |
| * | | | revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly removeAmineChikhaoui2018-05-31
| | | | | | | | | | | | | | | | | | | | the temporary ssh host keys file/directory.
* | | | | nixos/gitea: Respect gitea-dump enable option. (#41437)Thomas Kerber2018-06-04
| | | | |
* | | | | kubernetes: corrected spelling mistake in docs (#41439)Geoffrey Huntley2018-06-04
| | | | |
* | | | | nixos/exim: Add unit restart trigger (#41418)Janne Heß2018-06-03
| | | | |
* | | | | Merge branch 'staging'Vladimír Čunát2018-06-03
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | It's only half-rebuilt on Hydra, but it brings a security fix.
| * \ \ \ \ Merge pull request #40242 from gnidorah/gvtMatthew Justin Bauer2018-06-01
| |\ \ \ \ \ | | | | | | | | | | | | | | linux: enable support for iGVT-g VGPU
| | * | | | | nixos/kvmgt: initgnidorah2018-05-29
| | | | | | |
* | | | | | | mpd: fix spelling in descriptionRobert Helgesson2018-06-03
| | | | | | |
* | | | | | | Merge pull request #41377 from markuskowa/slurm-ext-prJoachim F2018-06-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos/slurm: Improve slurm configuration options and features.
| * | | | | | | nixos/slurm: remove propagatedBuidInputs from slurmWrappedMarkus Kowalewski2018-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | propagatedBuildInputs = [ cfg.package etcSlurm ]; had no effect
| * | | | | | | nixos/slurm: update test, add test for enableStoolsMarkus Kowalewski2018-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add pure submit host to test 'enableStools' * Disable client.enable on control machine
| * | | | | | | slurm: add freeipmi, readline, libssh2, fix hwlocMarkus Kowalewski2018-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add freeipmi to get power meter readings * readline support for scontrol * libssh2 support for X11 supporta * Add note to enableSrunX11 in module * fix hwloc support (was detected by configure)
| * | | | | | | nixos/slurm: Add man pages to wrapedSlurmMarkus Kowalewski2018-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nixos module adds a new derivation to systemPackages to make sure that the binaries get the generated config file. This derivation did not contain the man pages so far. Activating the module now makes the man pages available in the system environment.
| * | | | | | | nixos/slurm: Extend configuration optionsMarkus Kowalewski2018-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated SrunX11 option * Added extraPlugstackConfig parameter * Added option enableStools * Add cgroup.conf to module * Fix some typos
* | | | | | | | Merge pull request #34886 from leenaars/mortyproxyJoachim F2018-06-02
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | morty: init -> 0.2.0
| * | | | | | | | morty: init as serviceMichiel Leenaars2018-05-30
| | | | | | | | |
* | | | | | | | | Merge pull request #40028 from WilliButz/add-dnsmasq-exporterMatthew Justin Bauer2018-06-01
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | prometheus-dnsmasq-exporter: init at 2018-05-05, add module
| * | | | | | | | | nixos/promtheus-dnsmasq-exporter: add moduleWilliButz2018-05-06
| | | | | | | | | |
* | | | | | | | | | Merge pull request #40037 from alunduil/fix-fcrontab-setuidMatthew Justin Bauer2018-06-01
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | nixos/modules/services/scheduling/fcron: add setuid to fcrontab
| * | | | | | | | | | nixos/modules/services/scheduling/fcron: add setuid to fcrontabAlex Brandt2018-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without fcrontab being setuid, every attempt by an user in the fcron group to edit their own crontab (via `fcrontab -e`) results in the following error: ``` 2018-05-06 11:29:07 ERROR could not change euid to 273: Operation not permitted 2018-05-06 11:29:07 ERROR fcron child aborted: this does not affect the main fcron daemon, but this may prevent a job from being run or an email from being sent. ``` Adding setuid by hand has resolved this issue and aligns with the way fcrontab is installed on other distributions.
* | | | | | | | | | | Merge pull request #40171 from teto/ntpMatthew Justin Bauer2018-06-01
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [RDY] openntpd: make -s flag work
| * | | | | | | | | | | openntpd: make -s flag workMatthieu Coudron2018-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after seeing `adjtime failed: Invalid argument` in my syslog, I tried using `ntpd -s` but it would trigger `/etc/ntpd.conf: No such file or directory` see https://github.com/NixOS/nixpkgs/issues/31885 Instead of running the daemon with a specific config file, use the standard file so that user are able to use the ntp executable without having to look for the current config file.
* | | | | | | | | | | | Merge pull request #40692 from Izorkin/sshdMatthew Justin Bauer2018-06-01
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | sshd: add custom options
| * | | | | | | | | | | sshd: add custom optionsIzorkin2018-05-19
| | | | | | | | | | | |
* | | | | | | | | | | | nixos/tests/iftop: fix non-deterministic failure (#41309)xeji2018-06-01
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make sure machines are fully booted before sending commands - test that capability setting in iftop module makes a difference
* | | | | | | | | | | Merge pull request #41367 from andir/nixos-mpd-dbFile-nullAndreas Rammhold2018-06-01
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nixos/mpd: allow services.mpd.dbFile to be null
| * | | | | | | | | | | nixos/mpd: allow services.mpd.dbFile to be nullAndreas Rammhold2018-06-01
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows users to specify an alternative database method. For example an mpd satellite setup where another mpd on the network shares it's database with the local instance. The `dbFile` parameter must not be configured in that case.
* | | | | | | | | | | Merge branch 'plat-fix-for-merge-2' into masterTuomas Tynkkynen2018-06-01
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | nixos/sd-image-raspberrypi: Support Raspberry Pi ZeroTuomas Tynkkynen2018-06-01
| | | | | | | | | | |
* | | | | | | | | | | tests/containers-imperative: Include stdenvNoCCaszlig2018-06-01
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While building the container there are a few occasions where stdenvNoCC is used underneath. During the last staging merge, some change now tries to build texinfo during the test while building stdenvNoCC. With this change, I'm adding stdenvNoCC to the closure to make sure that even when we have future stdenv changes, it doesn't break (well, except if we do have another variation like stdenvNoCC that overrides stdenv). I haven't bisected the exact change, but I'd suspect that it could be one of the commits in #39457. This fixes the test and it no longer fails with the following error: error: unable to download 'http://ftpmirror.gnu.org/texinfo/texinfo-6.5.tar.xz': Couldn't resolve host name (6) builder for '/nix/store/r7sf1wjbnimwgnv276jh59nfnzw40x30-texinfo-6.5.tar.xz.drv' failed with exit code 1 cannot build derivation '/nix/store/5w1pv788ayi1wahyy76i90yqv96ai4h5-texinfo-6.5.drv': 1 dependencies couldn't be built cannot build derivation '/nix/store/cnsfkf0j5xmm14zzm5a3a66pz66gbc82-stdenv-linux.drv': 1 dependencies couldn't be built cannot build derivation '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv': 1 dependencies couldn't be built error: build of '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv' failed /run/current-system/sw/bin/nixos-container: failed to build initial container configuration Signed-off-by: aszlig <aszlig@nix.build> Cc: @aristidb, @edolstra, @chaoflow, @kampfschlaefer
* | | | | | | | | | Revert "nixos: disable gdk-pixbuf test"Jan Tojnar2018-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 218ada1ba7ecb0a3b1d9e7aed9147ba35d484faa.
* | | | | | | | | | dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039)coretemp2018-05-31
| | | | | | | | | |