about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2019-05-14
|\
| * Merge pull request #61089 from nlewo/pr-fix-layer-orderlewo2019-05-13
| |\ | | | | | | dockerTools: Fix Docker layers order
| | * nixos/tests/docker-tools: verify order of layers in stacked imagesAntoine Eiche2019-05-07
| | |
| * | Merge pull request #59480 from worldofpeace/fprintd-systemdworldofpeace2019-05-13
| |\ \ | | | | | | | | nixos/fprintd: use systemd.packages
| | * | nixos/fprintd: use systemd.packagesworldofpeace2019-04-14
| | | | | | | | | | | | | | | | Upstream has a systemd service.
| * | | FIx some malformed XML in option descriptionsEelco Dolstra2019-05-13
| | | | | | | | | | | | | | | | | | | | E.g. these were using "<para>" at the *end* of a description. The real WTF is that this is possible at all...
| * | | Merge pull request #61257 from matthewbauer/add-binfmt-emulated-systemsJohn Ericson2019-05-12
| |\ \ \ | | | | | | | | | | nixos/binfmt: handle emulatedSystems
| | * | | nixos/binfmt: fixupMatthew Bauer2019-05-10
| | | | |
| | * | | binfmt: add more magics and masksMatthew Bauer2019-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New ones taken from this script: https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh
| | * | | nixos/binfmt: handle emulatedSystemsMatthew Bauer2019-05-10
| | | | | | | | | | | | | | | | | | | | Fixes #61248
| * | | | nixos/luksroot: GPG Smartcard support for luks encrypted volumesMarkus Schmidl2019-05-12
| | | | |
* | | | | Merge master into staging-nextFrederik Rietdijk2019-05-12
|\| | | |
| * | | | Merge pull request #60187 from joachifm/feat/configurable-mallocJoachim F2019-05-12
| |\ \ \ \ | | | | | | | | | | | | nixos: configurable system-wide malloc
| | * | | | nixos/tests/hardened: test hardened mallocJoachim Fasting2019-05-07
| | | | | |
| | * | | | nixos/hardened: use graphene-hardened malloc by defaultJoachim Fasting2019-05-07
| | | | | |
| | * | | | nixos/malloc: configure system-wide malloc providerJoachim Fasting2019-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this uses the somewhat crude method of setting LD_PRELOAD in the system environment. This works, but should be considered a stepping stone to a more robust solution.
| * | | | | Merge pull request #61306 from joachifm/feat/fix-apparmor-boot-linux_5_1Joachim F2019-05-12
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix apparmor boot on linux 5.1
| | * | | | | nixos/tests/hardened: check that apparmor is properly loadedJoachim Fasting2019-05-11
| | | | | | |
| | * | | | | nixos/apparmor: ensure that apparmor is selected at bootJoachim Fasting2019-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we're subject to whatever defaults were selected at kernel build time. See also: https://github.com/NixOS/nixpkgs/issues/61145
| * | | | | | Merge pull request #61311 from turboMaCk/xss-lock-locker-optionsMaximilian Bosch2019-05-12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | xss-lock: improve locker options passing
| | * | | | | | nixos/xss-lock: add testcase for `lockerCommand` with several CLI options.Maximilian Bosch2019-05-12
| | | | | | | |
| | * | | | | | nixos/xss-lock: improve moduleMaximilian Bosch2019-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't use `literalExample`, raw Nix values can directly be specified as an option example which provides support for highlighting in the manual as well. * Escape shell args for `extraOptions`: I.e. the `-n` option might be problematic as a longer notification command might be misinterpreted.
| | * | | | | | xss-locker: improve options passingMarek Fajkus2019-05-11
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow locker options without hacks - add extraOptions
| * | | | | | Merge pull request #61032 from dtzWill/feature/rngd-hardenRenaud2019-05-11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | rngd: harden service config, settings from arch
| | * | | | | | rngd: harden service config, from archWill Dietz2019-05-07
| | | | | | | |
* | | | | | | | Merge branch 'master' into staging-nextVladimír Čunát2019-05-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~5k rebuilds per platform. Hydra nixpkgs: ?compare=1518759
| * | | | | | | maintainers: add kolaentekolaente2019-05-11
| | | | | | | |
| * | | | | | | Merge pull request #61048 from Ma27/zmap-packageworldofpeace2019-05-10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | zmap: init at 2.1.1
| | * | | | | | | nixos/zmap: init moduleMaximilian Bosch2019-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module installs `zmap` globally and links the config files to `/etc/zmap`, the default location of config files for zmap. The package provides pretty much a sensitive default, custom configs can be created like this: ``` { lib, ... }: { environment.etc."zmap/blacklist.conf" = lib.mkForce { text = '' # custom zmap blacklist 0.0.0.0/0 ''; }; } ```
| * | | | | | | | Merge pull request #61237 from basvandijk/journalbeat-fixesBas van Dijk2019-05-10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | NixOS: support journalbeat >= 6
| | * | | | | | | | nixos/journalbeat: support journalbeat >= 6 & add testBas van Dijk2019-05-10
| | | | | | | | | |
| * | | | | | | | | virtualbox: 5.2.28 -> 6.0.6Ambroz Bizjak2019-05-09
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quite some fixing was needed to get this to work. Changes in VirtualBox and additions: - VirtualBox is no longer officially supported on 32-bit hosts so i686-linux is removed from platforms for VirtualBox and the extension pack. 32-bit additions still work. - There was a refactoring of kernel module makefiles and two resulting bugs affected us which had to be patched. These bugs were reported to the bug tracker (see comments near patches). - The Qt5X11Extras makefile patch broke. Fixed it to apply again, making the libraries logic simpler and more correct (it just uses a different base path instead of always linking to Qt5X11Extras). - Added a patch to remove "test1" and "test2" kernel messages due to forgotten debugging code. - virtualbox-host NixOS module: the VirtualBoxVM executable should be setuid not VirtualBox. This matches how the official installer sets it up. - Additions: replaced a for loop for installing kernel modules with just a "make install", which seems to work without any of the things done in the previous code. - Additions: The package defined buildCommand which resulted in phases not running, including RUNPATH stripping in fixupPhase, and installPhase was defined which was not even run. Fixed this by refactoring using phases. Had to set dontStrip otherwise binaries were broken by stripping. The libdbus path had to be added later in fixupPhase because it is used via dlopen not directly linked. - Additions: Added zlib and libc to patchelf, otherwise runtime library errors result from some binaries. For some reason the missing libc only manifested itself for mount.vboxsf when included in the initrd. Changes in nixos/tests/virtualbox: - Update the simple-gui test to send the right keys to start the VM. With VirtualBox 5 it was enough to just send "return", but with 6 the Tools thing may be selected by default. Send "home" to reliably select Tools, "down" to move to the VM and "return" to start it. - Disable the VirtualBox UART by default because it causes a crash due to a regression in VirtualBox (specific to software virtualization and serial port usage). It can still be enabled using an option but there is an assert that KVM nested virtualization is enabled, which works around the problem (see below). - Add an option to enable nested KVM virtualization, allowing VirtualBox to use hardware virtualization. This works around the UART problem and also allows using 64-bit guests, but requires a kernel module parameter. - Add an option to run 64-bit guests. Tested that the tests pass with that. As mentioned this requires KVM nested virtualization.
| * | | | | | | | Merge pull request #60569 from dtzWill/update/vnstat-2.2Renaud2019-05-09
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | vnstat: 2.1 -> 2.2
| | * | | | | | | vnstat: 2.1 -> 2.2Will Dietz2019-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://humdi.net/vnstat/CHANGES * enable tests * add hardening options from upstream's example service * fix "documentation" setting in service: either needs to be `unitConfig.Documentation` (uppercase) or lowercase but not within unitConfig.
| * | | | | | | | Merge pull request #44086 from erikarvstedt/paperlessworldofpeace2019-05-08
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | paperless: add package and service
| | * | | | | | | | paperless service: initErik Arvstedt2019-05-08
| | | | | | | | | |
| * | | | | | | | | Merge pull request #60776 from alyssais/xerrorAlyssa Ross2019-05-08
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | nixos/xserver: improve DM error message when X off
| | * | | | | | | | nixos/xserver: improve DM error message when X offAlyssa Ross2019-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if you, for example, set services.xserver.displayManager.sddm.enable, but forgot to set services.xserver.enable, you would get an error message that looked like this: error: attribute 'display-manager' missing Which was not particularly helpful. Using assertions, we can make this message much better.
| * | | | | | | | | Merge pull request #61072 from dtzWill/feature/rngd-debug-flagWill Dietz2019-05-07
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | rngd: add option to run w/debug flag
| | * | | | | | | | rngd: add option to run w/debug flagWill Dietz2019-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added while testing if adding hardening directives to the service blocked access to various sources, might be useful in the future.
* | | | | | | | | | Merge staging-next into stagingFrederik Rietdijk2019-05-07
|\| | | | | | | | |
| * | | | | | | | | jellyfin: remove assertion if emby enabled: no emby module existsDavid Izquierdo2019-05-07
| |/ / / / / / / /
| * | | | | | | | Merge pull request #60237 from mayflower/kexec-no-clobberLinus Heckemann2019-05-06
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | nixos/kexec: don't clobber existing kexec-loaded kernel
| | * | | | | | | nixos/kexec: log what's happeningLinus Heckemann2019-04-29
| | | | | | | | |
| | * | | | | | | nixos/kexec: don't clobber existing kexec-loaded kernelLinus Heckemann2019-04-26
| | | | | | | | |
| * | | | | | | | Merge pull request #59943 from romildo/fix.deepin.modulesJosé Romildo Malaquias2019-05-05
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos/deepin: use only one module for deepin services
| | * | | | | | | | nixos/deepin: add deepin-anything serviceJosé Romildo Malaquias2019-05-05
| | | | | | | | | |
| | * | | | | | | | nixos/deepin: add dde-dock dbus serviceJosé Romildo Malaquias2019-05-05
| | | | | | | | | |
| | * | | | | | | | nixos/deepin: install polkit local authority files in /etcJosé Romildo Malaquias2019-05-05
| | | | | | | | | |
| | * | | | | | | | nixos/deepin: add deepin-screenshot dbus serviceJosé Romildo Malaquias2019-05-05
| | | | | | | | | |