summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* nixos/pppd: add description for peers, unbreaks metrics job and channelFrederik Rietdijk2019-10-17
| | | | | services.pppd.peers was lacking a description, causing a trace warning resulting in a parse error in the metrics job.
* Revert "Merge pull request #71095 from flokli/pinentry-cleanup"worldofpeace2019-10-16
| | | | | This reverts commit 823da4d492b8b4ad46bf812db8421d99ff17a8fc, reversing changes made to b75c8ee3bc1b9734c29740e9d17ac2175fe207fd.
* Merge pull request #71095 from flokli/pinentry-cleanupworldofpeace2019-10-17
|\ | | | | Split pinentry flavors and enable udisks2 on install media again
| * udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2Florian Klink2019-10-16
| |
| * Revert "installer: Disable udisks"Franz Pletz2019-10-16
| | | | | | | | | | | | | | | | This reverts commit 571fb74f449aa173e231166515b41feb778524b8. The dependency on gtk2 was removed. Co-authored-by: Florian Klink <flokli@flokli.de>
| * gnupg: disable gui/pinentry support by defaultFranz Pletz2019-10-16
| | | | | | | | | | | | | | | | | | | | | | | | This solves the dependency cycle in gcr alternatively so there won't be two gnupg store paths in a standard NixOS system which has udisks2 enabled by default. NixOS users are expected to use the gpg-agent user service to pull in the appropriate pinentry flavour or install it on their systemPackages and set it in their local gnupg agent config instead. Co-authored-by: Florian Klink <flokli@flokli.de>
| * nixos/gnupg: add option for setting pinentry flavoursFranz Pletz2019-10-16
| | | | | | | | Co-authored-by: Florian Klink <flokli@flokli.de>
| * pinentry: build with multiple outputs in single drvFranz Pletz2019-10-16
| | | | | | | | | | Co-authored-by: Florian Klink <flokli@flokli.de> Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
* | nixos/pppd: init (#71105)Florian Klink2019-10-17
|\ \ | |/ |/| nixos/pppd: init
| * nixos/tests/pppd: initDavid Anderson2019-10-15
| | | | | | | | | | This test creates a PPPoE link between two machines, and verifies that the machines can ping each other.
| * nixos/pppd: initDavid Anderson2019-10-15
| |
* | nixos/system-environment: prepend wrapperDir to PATH (#70430)Tor Hedin Brønner2019-10-15
| | | | | | | | | | | | | | | | | | | | | | | | This fixes user environment setup for sessions which doesn't successfully go through a shell init. Note we don't go through `sessionVariables` as we want the wrappers to have highest priority. It would also cause wrapperDir to occur twice when in shell sessions, as shells use `sessionVariables` too while prepending wrapperDir in a custom snippet. In particular logging in and out of gnome-shell could result in a broken path without this fix.
* | Merge pull request #70240 from woffs/pr-etc-zpool.dJörg Thalheim2019-10-15
|\ \ | | | | | | nixos module zfs: provide /etc/zfs/zpool.d
| * | nixos module zfs: provide /etc/zfs/zpool.dFrank Doepper2019-10-02
| | | | | | | | | | | | | | | The scripts for zpool iostat -c and zpool status -c are located in /etc/zfs/zpool.d
* | | Merge pull request #70469 from Vskilet/matrix-synapse-updateMaximilian Bosch2019-10-15
|\ \ \ | | | | | | | | matrix-synapse: 1.3.1 -> 1.4.0
| * | | matrix-synapse: 1.3.1 -> 1.4.0Victor SENE2019-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps `matrix-synapse` to version 1.4.0[1]. With this version the following changes in the matrix-synapse module were needed: * Removed `trusted_third_party_id_servers`: option is marked as deprecated and ignored by matrix-synapse[2]. * Added `account_threepid_delegates` options as replacement for 3rdparty server features[3]. * Added `redaction_retention_period` option to configure how long redacted options should be kept in the database. * Added `ma27` as maintainer for `matrix-synapse`. Co-Authored-By: Notkea <pacien@users.noreply.github.com> Co-authored-by: Maximilian Bosch <maximilian@mbosch.me> [1] https://matrix.org/blog/2019/10/03/synapse-1-4-0-released [2] https://github.com/matrix-org/synapse/pull/5875 [3] https://github.com/matrix-org/synapse/pull/5876
* | | | Fix typo in 19.09 release notesArian van Putten2019-10-14
| | | |
* | | | Merge pull request #70070 from Ma27/borgbackup-removable-devicesWilliButz2019-10-14
|\ \ \ \ | | | | | | | | | | nixos/borgbackup: add option to allow removable devices
| * | | | nixos/borgbackup: add option to allow removable devicesMaximilian Bosch2019-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When having backup jobs that persist to a removable device like an external HDD, the directory shouldn't be created by an activation script as this might confuse auto-mounting tools such as udiskie(8). In this case the job will simply fail, with the former approach udiskie ran into some issues as the path `/run/media/ma27/backup` was already there and owned by root.
* | | | | Merge pull request #70601 from Mic92/zfs-trimJörg Thalheim2019-10-14
|\ \ \ \ \ | |_|_|_|/ |/| | | | nixos/zfs: only enable trim if zfs is enabled
| * | | | nixos/zfs: mention trim support in the release notesJörg Thalheim2019-10-14
| | | | |
| * | | | nixos/zfs: simplify logic for scrub/autosnapshot serviceJörg Thalheim2019-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | This makes them consistent with the way zfs.trim is enabled and allow to enable them by default in future.
| * | | | nixos/zfs: avoid script derivation for trim serviceJörg Thalheim2019-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | Since we only have a single pipe we can save the overhead of building a derivation when creating the zfs trim service file when building the system.
| * | | | nixos/zfs: only enable trim if zfs is enabledJörg Thalheim2019-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | Also don't fail the service if there are no pools yet. This might happen on installation ISOs.
* | | | | nixos/environment: don't set GTK_DATA_PREFIX or GTK_EXE_PREFIXworldofpeace2019-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had these set so gtk2 can discover themes properly, however we failed realize that gtk2 already has a patch that makes it search in XDG_DATA_DIRS. I don't believe any issue is solved by setting these.
* | | | | nixos/mysql: fix mysqlReplication test (#61671)Florian Klink2019-10-13
|\ \ \ \ \ | | | | | | | | | | | | nixos/mysql: fix mysqlReplication test
| * | | | | nixos/mysql: fix mysqlReplication testIzorkin2019-10-13
| | | | | |
* | | | | | Merge pull request #70999 from c0bw3b/tests/fix/getfaclworldofpeace2019-10-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | nixos.tests: silence getfacl absolute path message
| * | | | | | nixos.tests: silence getfacl absolute path messagec0bw3b2019-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default getfacl behavior is to remove leading slash on absolute paths in its header printed to stdout. Before the header it will also print a message about it... Switches -p -or --absolute-names can turn this off and remove some noise from our tests logs.
* | | | | | | Merge pull request #71065 from worldofpeace/gdm-no-plymouth-conflictworldofpeace2019-10-13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos/gdm: don't conflict with plymouth-quit
| * | | | | | | nixos/gdm: don't conflict with plymouth-quitworldofpeace2019-10-13
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Co-Authored-By: Tor Hedin Brønner <torhedinbronner@gmail.com>
* | | | | | | Merge pull request #68441 from jonringer/fix-nextcloud-testMaximilian Bosch2019-10-13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos/nextcloud: fix postgresql/redis test
| * | | | | | | nixos/nextcloud: fix postgresql testMaximilian Bosch2019-10-13
| | | | | | | |
| * | | | | | | nixos/nextcloud: fix postgresql/redis testJonathan Ringer2019-10-12
| | | | | | | |
* | | | | | | | Merge branch 'staging-next'Vladimír Čunát2019-10-13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not perfect, but I think we can deal with the rest of the regressions directly on master, so that this process does not stall.
| * \ \ \ \ \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2019-10-13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hydra nixpkgs: ?compare=1548439
| * \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2019-10-12
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge master into staging-nextFrederik Rietdijk2019-10-08
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2019-10-03
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge staging into staging-nextFrederik Rietdijk2019-09-29
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'staging-next' into stagingDmitry Kalinkin2019-09-25
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes eval on darwin after #69072 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'staging-next' into stagingVladimír Čunát2019-09-24
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'staging-next' into stagingJan Tojnar2019-09-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Enable work variant firewall with iptables-compat (#66953)Jörg Thalheim2019-09-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable work variant firewall with iptables-compat
| | | * | | | | | | | | | | | | | nixos/firewall: rename iptables-compat to iptables-nftables-compatJörg Thalheim2019-09-22
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | nixos/firewall: add package optionIzorkin2019-09-03
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'staging-next' into stagingVladimír Čunát2019-09-22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingMatthew Bauer2019-09-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2019-09-19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'staging-next' into stagingJan Tojnar2019-09-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \