about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* 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
| | | | | | | | |
* | | | | | | | | Revert "nixpkgs module: Fix defaulting of `localSystem` and `system`"Matthew Bauer2018-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4fe289860888668956b7e79e24efeb101c2f51d1. This gives a recursion in certain nixpkgs configs.
* | | | | | | | | nixos: disable gdk-pixbuf testMatthew Bauer2018-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test currently relies on installedTests output which was reverted in 85ae7137ac6a1623be90c8f0897566367d300c12. See https://github.com/NixOS/nixpkgs/commit/85ae7137ac6a1623be90c8f0897566367d300c12 for discussion.
* | | | | | | | | zsh: only do promptInit when TERM!=dumbMatthew Bauer2018-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows tramp to be used correctly when default shell is zsh.
* | | | | | | | | qemu-flags: default to qemu-kvmMatthew Bauer2018-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is the "generic" version & should work everywhere. also add darwin case
* | | | | | | | | Merge pull request #40708 from obsidiansystems/nixos-nixpkgs-defaultsMatthew Justin Bauer2018-05-31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixpkgs module: Fix defaulting of `localSystem` and `system`
| * | | | | | | | | nixpkgs module: Fix defaulting of `localSystem` and `system`John Ericson2018-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My c6f7d4367894047592cc412740f0c1f5b2ca2b59 made the mistake of not having enough defaults. Now both variables are default as the *explicit* value of the other, or a fallback. The fallback of `system` is the default of `localSystem.system`. The fallback of `localSystem` is not the other default (projected), as that would cause a cycle, but `{ system = builtins.currentTime; }` just as nixpkgs itself does it.
* | | | | | | | | | Merge pull request #41218 from Gerschtli/fix/gitea-pre-startJoachim F2018-05-31
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | nixos/gitea: fix pre start script
| * | | | | | | | | nixos/gitea: fix pre start scriptTobias Happ2018-05-29
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hooks directory contains now one level deep subdirectories which need to be updated as well. If you use gitea via ssh, ~/.ssh/authorized_keys also needs to be updated because of the hardcoded path to gitea in the "command" option.
* | | | | | | | | nix: 2.0.3 -> 2.0.4Eelco Dolstra2018-05-31
| | | | | | | | |
* | | | | | | | | Update GCE image for 18.03Rob Vermaas2018-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 8aa385069f830fc801c8a04d2bd8a70a02be3de4)
* | | | | | | | | nix: 2.0.2 -> 2.0.3Eelco Dolstra2018-05-30
| | | | | | | | |
* | | | | | | | | Merge pull request #40579 from peterhoeg/m/sddmPeter Hoeg2018-05-30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | sddm: add support for hidpi mode
| * | | | | | | | | sddm: add support for hidpi modePeter Hoeg2018-05-16
| | | | | | | | | |
* | | | | | | | | | nixos/bind: Allow to set extra optionsaszlig2018-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BIND doesn't allow the options section (or any section I'd guess) to be defined more than once, so whenever you want to set an additional option you're stuck using weird hacks like this: services.bind.forwarders = lib.mkForce [ "}; empty-zones-enable no; #" ]; This basically exploits the fact that values coming from the module options aren't escaped and thus works in a similar vain to how SQL injection works. Another option would be to just set configFile to a file that includes all the options, including zones. That obviously makes the configuration way less extensible and more awkward to use with the module system. To make sure this change does work correctly I added a small test just for that. The test could use some improvements, but better to have a test rather than none at all. For a future improvement the test could be merged with the NSD test, because both use the same zone file format. This change has been reviewed in #40053 and after not getting any opposition, I'm hereby adding this to master. Signed-off-by: aszlig <aszlig@nix.build> Cc: @peti, @edolstra Closes: #40053
* | | | | | | | | | Merge pull request #38791 from LnL7/nixos-profile-variablesDaiderd Jordan2018-05-30
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | nixos: remove PKG_CONFIG_PATH/PERL5LIB environment variables
| * | | | | | | | | nixos: remove PKG_CONFIG_PATH and PERL5LIB environment variablesDaiderd Jordan2018-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These make libraries installed in the system or even user profiles magically available.