summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* nixos/thermald: add manual config fileJake Woods2018-08-19
| | | | | | thermald has two modes: zero-config and manual. Sometimes it is useful to manually configure thermald to achieve better thermal results or to give thermald a hand when detecting possible cooling options.
* Merge pull request #44880 from srghma/build-max-jobs-autoSilvan Mosberger2018-08-18
|\ | | | | nixos/nix-daemon: build-max-jobs, add support to auto
| * nixos/nix-daemon: build-max-jobs, add support to autosrghma2018-08-18
| |
* | Merge branch 'master' into staging-nextVladimír Čunát2018-08-17
|\ \ | | | | | | | | | Hydra: ?compare=1473892
| * | nixos: Fix iso_graphical evaluationTuomas Tynkkynen2018-08-17
| | | | | | | | | | | | | | | | | | I broke it: in job ‘nixos.iso_graphical.x86_64-linux’: The option `services.udisks2.enable' has conflicting definitions, in `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/profiles/installation-device.nix' and `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/services/x11/desktop-managers/plasma5.nix'.
| * | installer: Disable udisksTuomas Tynkkynen2018-08-17
| | | | | | | | | | | | | | | Due to whoever-knows-what, udisks nowadays pulls in GTK+ et al. But it shouldn't be needed anyway in the installer, so disable it.
| * | Merge pull request #45078 from Izorkin/syslog-ng-reload-fixSilvan Mosberger2018-08-16
| |\ \ | | | | | | | | syslog-ng: fix reload service
| | * | syslog-ng: fix reload serviceIzorkin2018-08-16
| | | |
| | * | syslog-ng: fix reload serviceIzorkin2018-08-16
| | | |
| * | | Merge pull request #45107 from mnacamura/lightdm-accountsserviceJan Tojnar2018-08-16
| |\ \ \ | | | | | | | | | | lightdm: enable the accounts daemon to find dbus interface
| | * | | lightdm: enable the accounts daemon to find dbus interfaceMitsuhiro Nakamura2018-08-16
| | | | |
| | * | | lightdm: fix typosMitsuhiro Nakamura2018-08-16
| | | | |
| | * | | accountsservice: fix a bugMitsuhiro Nakamura2018-08-16
| | |/ /
| * | | Merge pull request #44238 from jfrankenau/samba-conf-overrideSilvan Mosberger2018-08-16
| |\ \ \ | | | | | | | | | | nixos/samba: allow dummy conf file to be overridden
| | * | | nixos/samba: allow dummy conf file to be overriddenJohannes Frankenau2018-08-16
| | | | | | | | | | | | | | | | | | | | This allows configuring samba clients on systems without a samba server.
| * | | | Merge pull request #40747 from WhittlesJr/synergy-fixSilvan Mosberger2018-08-16
| |\ \ \ \ | | | | | | | | | | | | services.synergy: Use graphical target (fixes #9468)
| | * | | | nixos/synergy: Use graphical target (fixes #9468)Alex Whitt2018-08-16
| | | | | |
| * | | | | Merge pull request #45095 from worldofpeace/zeitgeist-serviceJan Tojnar2018-08-16
| |\ \ \ \ \ | | | | | | | | | | | | | | nixos/zeitgeist: init
| | * | | | | nixos/zeitgeist: initworldofpeace2018-08-15
| | | | | | |
| * | | | | | nixos/qemu-vm: Don't explicitly mknod /dev/vda*Sarah Brofeldt2018-08-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And don't need to source the uevent files anymore either since $MAJOR or $MINOR aren't used elsewhere. [dezgeg: The reason these are no longer needed is that 0d27df280f7ed5 switched /tmp to a devtmpfs which automatically creates such device nodes]
| * | | | | | Merge pull request #44233 from jfrankenau/networkd-fix-optionsJörg Thalheim2018-08-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos/networkd: add missing options
| | * | | | | | nixos/networkd: add missing optionsJohannes Frankenau2018-08-16
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #45098 from Chiiruno/dev/hydronJörg Thalheim2018-08-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix hydron service, update hydron and meguca
| | * | | | | | nixos/hydron: Various tweaksOkina Matara2018-08-15
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make timer persistent Start timer after hydron Change interval from hourly to weekly
| * | | | | | Merge pull request #40399 from rvl/datadog-agentSamuel Leathers2018-08-15
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | DataDog Agent v6
| | * | | | | nixos/datadog-agent: Add option to configure datadog integrationsVincent Ambo2018-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces an option `services.datadog-agent.extraIntegrations` that can be set to include additional Datadog agent integrations from the integrations-core repository. Documentation and an example is provided with the change. Relates to NixOS/nixpkgs#40399
| | * | | | | nixos/datadog-agent: Refactor to allow arbitrary check configsVincent Ambo2018-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors the datadog-agent (i.e. V6) module to let users configure arbitrary checks, not just a limited set, without having to resort to linking the files manually and updating the systemd unit. Checks are now configured via a `services.datadog-agent.checks` option which takes an attribute set in which the keys refer directly to Datadog check names, and the values are attribute sets representing Datadog's configuration structure. With this mechanism users can configure arbitrary integrations, for example for the `ntp`-check, simply by saying: services.datadog-agent.checks.ntp = { init_config = null; # ... other check configuration options as per Datadog # documentation }; The previous check-specific configuration options for non-default checks have been removed. Disk & network check configuration options have been kept rather than making them a `default`-value of the `checks`-option because they will be overridden by user-configurations in that case. Relates to NixOS/nixpkgs#40399.
| | * | | | | nixos/datadog-agent: add moduleRodney Lorrimar2018-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the new v6 version of datadog-agent. The old v5 module is kept as dd-agent.
| | * | | | | nixos/dd-agent: Fix dodgy temp filesRodney Lorrimar2018-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DataDog was dropping PID files and and python pickle files in /tmp. Move these to private directories as a precaution.
| * | | | | | Merge pull request #45073 from Izorkin/syslog-ngJörg Thalheim2018-08-15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | syslog-ng: enable reload service
| | * | | | | | syslog-ng: enable reload serviceIzorkin2018-08-15
| | | | | | | |
| * | | | | | | Merge pull request #44896 from cdepillabout/vbox-extpackzimbatm2018-08-15
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | add derivation for the virtualbox oracle extension pack
| | * | | | | | Merge remote-tracking branch 'origin/master' into vbox-extpack(cdep)illabout2018-08-16
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | virtualbox: Add tests for the VirtualBox Extension Pack.(cdep)illabout2018-08-15
| | | | | | | |
| | * | | | | | virtualization: update the virtualbox-host module to use the extension pack ↵(cdep)illabout2018-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if enabled.
| * | | | | | | lib/recursiveUpdateUntil: add a test & release note for fixProfpatsch2018-08-15
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #44820 from michaelpj/fix/redshift-geoclue-agentsJan Tojnar2018-08-14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | redshift/geoclue/localtime: progress in fixing agent confusion
| | * | | | | | localtime: simplify module a littleMichael Peyton Jones2018-08-14
| | | | | | | |
| | * | | | | | geoclue2 service: add option to run demo agentMichael Peyton Jones2018-08-14
| | | | | | | |
| | * | | | | | redshift: install desktop files, and use absolute paths in them to avoid ↵Michael Peyton Jones2018-08-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confusing geoclue agent
| * | | | | | | Merge pull request #45012 from Mic92/zfsJörg Thalheim2018-08-14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
| | * | | | | | | linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13Jörg Thalheim2018-08-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spl was merged into zfs master
| * | | | | | | | Merge pull request #44841 from Ma27/bump-hydralewo2018-08-14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | hydra: 2017-11-21 -> 2018-08-07
| | * | | | | | | | hydra: 2017-11-21 -> 2018-08-07Maximilian Bosch2018-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bumps Hydra to the latest revision available. As Hydra doesn't have a release model (and therefore no tags) ATM, the derivation will pin against the actual git revision and the date of the commit in the derivation name. Additionally the following changes have been made: * Dropped `postUnpack` phase. It is useful when working with the Hydra source (and no dirty changes shall be used in `release.nix`, but is has no use in `nixpkgs`). * Added myself as maintainer to have more folks available in case of future breakage. * Implemented support for Nix 2.0 and `unstable` (currently 2.1): Since 1672bcd230447f1ce0c3291950bdd9a662cee974 in NixOS/nix the evaluator differentiates between `settings` and `evalSettings`. Previously `restrictEval` in `hydra-eval-jobs.cc` has been set in `settings`, this doesn't work anymore in Nix 2.1 and is therefore incompatible to Nix 2.0 on an API level. To resolve this, the flag `isGreaterNix20` parses the version string of `pkgs.nix` and applies a patch if nix.version<=2.0. Furthermore the Hydra build with Nix 2.1 requires `boost` as build input which is not needed for Nix 2.0. To avoid unnecessary increase in the closure size this library will only used as build input for nix.version>2.0. * Fixed the NixOS test for `hydra`: disabled binary cache to allow sandbox builds (otherwise it would query `cache.nixos.org` during the Hydra build inside the test). Additionally the trivial.nix jobset required simplification (as done in NixOS/hydra, e.g. tests/api-test.nix) as bash is not available in the build sandbox as builder (even when adding pkgs.bash to systemPackages). The easiest workaround to confirm a the functionality of a jobset without importing nixpkgs is to use the default shell /bin/sh which is mounted from `pkgs.busybox` into the build env (https://github.com/NixOS/nixpkgs/pull/44841#discussion_r209751972) in the VM and a named pipe to create $out. Closes #44044
| * | | | | | | | | Merge pull request #44524 from vincentbernat/fix/dhcpcd-systemdFranz Pletz2018-08-13
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | dhcpcd service: order before network target
| | * | | | | | | | dhcpcd service: order before network targetVincent Bernat2018-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a change applied in PR #18491. When interfaces are configured by DHCP (typical in a cloud environment), ordering after network.target cause trouble to applications expecting some network to be present on boot (for example, cloud-init is quite brittle when network hasn't been configured for `cloud-init.service`) and on shutdown (for example, collectd needs to flush metrics on shutdown). When ordering after network.target, we ensure applications relying on network.target won't have any network reachability on boot and potentially on shutdown. Therefore, I think ordering before network.target is better.
| * | | | | | | | | zfsLegacyCrypto: removeJörg Thalheim2018-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This package was only mandatory for migration for people on zfsUnstable in nixos unstable.
* | | | | | | | | | Merge branch 'master' into staging-nextVladimír Čunát2018-08-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190
| * | | | | | | | | environment.extraInit: fix description typoAlyssa Ross2018-08-13
| | | | | | | | | |
| * | | | | | | | | Merge pull request #44876 from eadwu/display-managers/pulseaudio-rely-on-socketSarah Brofeldt2018-08-12
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | nixos/display-managers: rely on socket to activate pulseaudio