summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* softether: 4.25 -> 4.29 (#60665)Hsiang-Cheng Yang2019-05-02
| | | | | | | * softether: 4.25 -> 4.29 * softether_4_29: restrict to x86_64-linux Does not build on aarch64 because of upstream "-m64" compile flag
* Merge pull request #60543 from Infinisil/fix/znc-genSilvan Mosberger2019-05-02
|\ | | | | nixos/znc: Fix config generator for certain null values
| * nixos/znc: Fix config generator for certain null valuesSilvan Mosberger2019-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of ZNC's config option specifies that a configuration like config.User.paul = null; should be valid, which is useful for clearing/disabling property sets like Users and Networks. However until now the config generator implementation didn't actually cover null values, meaning you'd get an error like error: value is null while a set was expected, at /foo.nix:29:10 This fixes the implementation to correcly allow clearing of property sets.
* | Merge pull request #55771 from Infinisil/nixos/znapzend/parallelSilvan Mosberger2019-05-02
|\ \ | | | | | | nixos/znapzend: Run znapzendzetup import in parallel
| * | nixos/znapzend: Run znapzendzetup import in parallelSilvan Mosberger2019-02-14
| | | | | | | | | | | | | | | | | | Patch by @Baughn, who noticed these imports being very slow when run serially with many datasets, so much that the service would time out and fail, this fixes it.
* | | Merge pull request #55422 from nand0p/ethminerSilvan Mosberger2019-05-02
|\ \ \ | | | | | | | | ethminer: init at 0.18.0-rc.0
| * | | nixos/ethminer: initFernando J Pando2019-05-01
| | | | | | | | | | | | | | | | - Tested on NixOS
* | | | Merge pull request #60097 from Mic92/openldap-rootpw-fileSilvan Mosberger2019-05-01
|\ \ \ \ | | | | | | | | | | nixos/openldap: make rootpw option optional
| * | | | nixos/openldap: make rootpw option optionalJörg Thalheim2019-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | This allows to store passwords in external files outside of the world-readable nix store.
* | | | | Merge pull request #60617 from nyanloutre/jellyfin_10_3_2Elis Hirwing2019-05-01
|\ \ \ \ \ | |_|_|_|/ |/| | | | jellyfin: 10.3.1 -> 10.3.2
| * | | | nixos/jellyfin: add test to all-tests.nixnyanloutre2019-05-01
| | | | |
* | | | | Merge pull request #59630 from worldofpeace/setcap-gnome-keyringworldofpeace2019-04-30
|\ \ \ \ \ | | | | | | | | | | | | gnome3.gnome-keyring: CAP_IPC_LOCK gnome-keyring-daemon
| * | | | | gnome3.gnome-keyring: CAP_IPC_LOCK gnome-keyring-daemonworldofpeace2019-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From gkd-capability.c: This program needs the CAP_IPC_LOCK posix capability. We want to allow either setuid root or file system based capabilies to work. If file system based capabilities, this is a no-op unless the root user is running the program. In that case we just drop capabilities down to IPC_LOCK. If we are setuid root, then change to the invoking user retaining just the IPC_LOCK capability. The application is aborted if for any reason we are unable to drop privileges.
* | | | | | Merge staging-next into masterFrederik Rietdijk2019-04-30
|\ \ \ \ \ \
| * \ \ \ \ \ Merge master into staging-nextFrederik Rietdijk2019-04-29
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge master into staging-nextFrederik Rietdijk2019-04-27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging into staging-nextFrederik Rietdijk2019-04-24
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'NixOS/master' into stagingMatthew Bauer2019-04-23
| | |\ \ \ \ \ \ \
| | * | | | | | | | nixos/virtualbox: Fixes configuration to evaluateSamuel Dionne-Riel2019-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue introduced by #57557
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into stagingMatthew Bauer2019-04-20
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into stagingJan Tojnar2019-04-20
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2019-04-18
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemasworldofpeace2019-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gnome3.pomodoro is left out because I don't want to create a conflict.
* | | | | | | | | | | | | Merge pull request #60415 from johanot/kubernetes-fix-control-plane-online-unitSarah Brofeldt2019-04-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nixos/kubernetes: fix control-plane-online prestart dependency
| * | | | | | | | | | | | | nixos/kubernetes: fix control-plane-online prestart dependencyJohan Thomsen2019-04-29
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kubeconfig provided to the kubernetes-control-plane-online.service is invalid. However, the apiserver /healthz endpoint can be accessed without auth so it's simpler to just use curl for that.
* | | | | | | | | | | | | Merge pull request #60377 from joachifm/feat/apparmor-systemdJoachim F2019-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | nixos/apparmor: service unit improvements
| * | | | | | | | | | | | nixos/apparmor: allow reloading profiles without losing confinementJoachim Fasting2019-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define ExecReload, otherwise reload implies stop followed by start, which leaves existing processes in unconfined state [1]. [1]: https://gitlab.com/apparmor/apparmor/wikis/AppArmorInSystemd
| * | | | | | | | | | | | nixos/apparmor: order before sysinit.targetJoachim Fasting2019-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, profiles may be loaded way too late in the init process.
* | | | | | | | | | | | | browserpass: Remove v2 and switch to buildGoModule (#60282)Silvan Mosberger2019-04-28
| | | | | | | | | | | | |
* | | | | | | | | | | | | nixos/luksroot: create /run/cryptsetup (#60235)Edmund Wu2019-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed since 2.0.0 Changed to /run/cryptsetup from /run/lock/cryptsetup in 2.0.1
* | | | | | | | | | | | | Merge pull request #60334 from bhipple/fix/doc-typoJoachim F2019-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nixos.grafana: fix docstring typo
| * | | | | | | | | | | | | nixos.grafana: fix docstring typoBenjamin Hipple2019-04-27
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #59465 from minijackson/module-jellyfinAaron Andersen2019-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixos/jellyfin: add simple testMinijackson2019-04-28
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | nixos/jellyfin: initMinijackson2019-04-28
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | nixos/sks: Fix another regression from ab5dcc7068bMichael Weiss2019-04-28
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two directories KDB and PTree do not exist before the SKS DB is build for the first time. If /var/db/sks is empty and the module is enabled via "services.sks.enable = true;" the following error will occur: ...-unit-script-sks-db-pre-start[xxx]: ln: failed to create symbolic link 'KDB/DB_CONFIG': No such file or directory To avoid this both links have to be created after the DB is build. Note: Creating the directories manually might be better but the initial build might be skipped as a result: unit-script-sks-db-pre-start[xxxxx]: KeyDB directory already exists. Exiting. unit-script-sks-db-pre-start[xxxxx]: PTree directory already exists. Exiting.
* | | | | | | | | | | | | | documize-module: refactor and add more optionselseym2019-04-28
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Revert "nixos/switch-to-configuration: Never stop system.slice"Michael Weiss2019-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was only a temporary workaround and isn't required anymore, since /etc/systemd/system/system.slice should not be present on any recent NixOS system (which makes this change a no-op). This reverts commit 7098b0fcdfd7fa4b82c036d8116b60b78f497316.
* | | | | | | | | | | | | | Merge pull request #59731 from ajs124/ejabberd_testSilvan Mosberger2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ejabberd: refactor module, add test
| * | | | | | | | | | | | | | nixos/ejabberd: migrate to tmpfiles, drop runitajs1242019-04-23
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | nixos/ejabberd: add basic testajs1242019-04-19
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | xmpp-sendmessage: init script file, use in prosody testajs1242019-04-17
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | sway: Read the configuration from /etc before /nix/store (#60319)Michael Weiss2019-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will load all configuration files from /etc, to make it easy to override them, but fallback to /nix/store/.../etc/sway/config to make Sway work out-of-the-box with the default configuration on non NixOS systems.
* | | | | | | | | | | | | | nixos/sks: Fix the module (the pre-start script was broken)Michael Weiss2019-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately the changes in ab5dcc7068bfaca3a7a2eaa8ad824a86c2595681 introduced a typo (took me a while to spot that...) that broke the whole module (or at least the sks-db systemd unit). The systemd unit was failing with the following error message: ...-unit-script-sks-db-pre-start[xxx]: KDB/DB_CONFIG exists but is not a symlink.
* | | | | | | | | | | | | | Merge pull request #60197 from etu/patch-gitea-generated-configSarah Brofeldt2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | nixos/gitea: Don't include not needed database options depending on type
| * | | | | | | | | | | | | nixos/gitea: Don't include not needed database options depending on typeElis Hirwing2019-04-25
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was discovered in https://github.com/NixOS/nixpkgs/pull/60014
* | | | | | | | | | | | | Merge pull request #60019 from aanderse/nzbgetFlorian Klink2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nzbget: fix broken service, as well as some improvements
| * | | | | | | | | | | | | nixos/nzbget: fix broken service, add a nixos test, as well as some general ↵Aaron Andersen2019-04-25
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improvements
* | | | | | | | | | | | | Merge pull request #59424 from florianjacob/journalwatchAaron Andersen2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | journalwatch: fix broken package, general maintenance
| * | | | | | | | | | | | | nixos/journalwatch: permissionsStartOnly is deprecatedFlorian Jacob2019-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #53852 for details, related to the efforts in #56265