2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 22:23:15 +00:00
Commit Graph

14581 Commits

Author SHA1 Message Date
Eelco Dolstra
5b324c1825
Remove references to the nixpkgs-channels repo
Channel branches are now provided in the nixpkgs repo.

Issue .
2019-10-17 19:44:03 +02:00
Florian Klink
36756e930f udisks2: use tmpfiles instead of activation script to create /var/lib/udisks2 2019-10-16 20:31:33 -04:00
Franz Pletz
ec6224b6cd Revert "installer: Disable udisks"
This reverts commit 571fb74f44.

The dependency on gtk2 was removed.

Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 20:31:24 -04:00
Franz Pletz
3d832dee59 gnupg: disable gui/pinentry support by default
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>
2019-10-16 20:31:16 -04:00
Franz Pletz
c2576266ba nixos/gnupg: add option for setting pinentry flavours
Co-authored-by: Florian Klink <flokli@flokli.de>
2019-10-16 20:31:05 -04:00
Franz Pletz
cb0adc11ff pinentry: build with multiple outputs in single drv
Co-authored-by: Florian Klink <flokli@flokli.de>
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2019-10-16 20:30:52 -04:00
Tor Hedin Brønner
2c7f0f06b7
nixos/system-environment: prepend wrapperDir to PATH ()
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.
2019-10-15 13:17:38 +02:00
Jörg Thalheim
faa7ce3ee5
Merge pull request from woffs/pr-etc-zpool.d
nixos module zfs: provide /etc/zfs/zpool.d
2019-10-15 11:45:52 +01:00
Maximilian Bosch
7774945b70
Merge pull request from Vskilet/matrix-synapse-update
matrix-synapse: 1.3.1 -> 1.4.0
2019-10-15 01:31:21 +02:00
Victor SENE
372422390f
matrix-synapse: 1.3.1 -> 1.4.0
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
2019-10-15 01:11:18 +02:00
Arian van Putten
8fb23f6117
Fix typo in 19.09 release notes 2019-10-14 23:30:09 +02:00
WilliButz
104b93eef0
Merge pull request from Ma27/borgbackup-removable-devices
nixos/borgbackup: add option to allow removable devices
2019-10-14 18:02:30 +02:00
Maximilian Bosch
2dfc67517a
nixos/borgbackup: add option to allow removable devices
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.
2019-10-14 17:28:44 +02:00
Jörg Thalheim
d633ec9787
Merge pull request from Mic92/zfs-trim
nixos/zfs: only enable trim if zfs is enabled
2019-10-14 11:04:35 +01:00
Jörg Thalheim
12880e57e1
nixos/zfs: mention trim support in the release notes 2019-10-14 10:30:59 +01:00
Jörg Thalheim
9a89467606
nixos/zfs: simplify logic for scrub/autosnapshot service
This makes them consistent with the way zfs.trim is enabled
and allow to enable them by default in future.
2019-10-14 10:30:57 +01:00
worldofpeace
dd050270c7 nixos/environment: don't set GTK_DATA_PREFIX or GTK_EXE_PREFIX
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.
2019-10-13 19:54:09 -04:00
Florian Klink
5d5b79d517
nixos/mysql: fix mysqlReplication test ()
nixos/mysql: fix mysqlReplication test
2019-10-13 23:05:23 +02:00
worldofpeace
6339c5864a
Merge pull request from c0bw3b/tests/fix/getfacl
nixos.tests: silence getfacl absolute path message
2019-10-13 17:49:52 +00:00
worldofpeace
6d5fe6b8ed
Merge pull request from worldofpeace/gdm-no-plymouth-conflict
nixos/gdm: don't conflict with plymouth-quit
2019-10-13 17:34:00 +00:00
worldofpeace
ed20a541c5 nixos/gdm: don't conflict with plymouth-quit
Co-Authored-By: Tor Hedin Brønner <torhedinbronner@gmail.com>
2019-10-13 13:30:43 -04:00
Maximilian Bosch
927204c987
Merge pull request from jonringer/fix-nextcloud-test
nixos/nextcloud: fix postgresql/redis test
2019-10-13 18:41:27 +02:00
Izorkin
632f69e485 nixos/mysql: fix mysqlReplication test 2019-10-13 19:18:51 +03:00
Vladimír Čunát
4e6826a3b2
Merge branch 'staging-next'
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.
2019-10-13 16:10:58 +02:00
Maximilian Bosch
81414c0a90
nixos/nextcloud: fix postgresql test 2019-10-13 14:32:14 +02:00
Maximilian Bosch
87178a2e6e
Merge pull request from WilliButz/add-nextcloud-exporter
prometheus-nextcloud-exporter: init at 2019-10-12, with module and test
2019-10-13 13:47:41 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
2019-10-13 13:31:33 +02:00
Maximilian Bosch
eeb4726446
nixos/prometheus-wireguard-exporter: remove addr option
This option was added by mistake since `listenAddress` exists by default
for each prometheus-exporter. Using
`services.prometheus.exporters.wireguard.addr` will now cause a warning,
but doesn't break eval.
2019-10-13 12:16:46 +02:00
Vladimír Čunát
7818f30cc4
Merge : nixos/steam-hardware: add uinput to boot.kernelModules 2019-10-13 10:21:49 +02:00
Tor Hedin Brønner
d15e5b02fe
nixos/lightdm: do not conflict with plymouth ()
Having `display-manager` conflict with `plymouth-quit` causes this lock up:

 - `plymouth-quit-wait` starts up, waiting for plymouth-quit to run
 - `lightdm` starts up
 - `plymouth-quit` can't start, it conflicts with lightdm
 - `plymouth-quit-wait` keeps waiting on plymouth-quit to kill plymouthd

The idea is having LightDM control when plymouth quits, but communication with
plymouth was broken: https://github.com/NixOS/nixpkgs/pull/71064

Unfortunately having the conflict breaks switching to configurations with
plymouth enabled. So we still need to remove the conflict.

fixes 
2019-10-13 10:03:54 +02:00
Jonathan Ringer
5e8ae589a4
nixos/nextcloud: fix postgresql/redis test 2019-10-12 15:07:27 -07:00
WilliButz
91b2c844df
nixos/tests/prometheus-exporters: add nextcloud exporter 2019-10-12 23:17:49 +02:00
WilliButz
d953d328ca
nixos/prometheus-nextcloud-exporter: add module 2019-10-12 23:17:48 +02:00
Florian Klink
aac5207b3f
babeld: add test ()
babeld: add test
2019-10-12 18:04:37 +02:00
Joachim F
a8b2e302c6
Merge pull request from Izorkin/samba
samba: fix autostart service
2019-10-12 14:31:39 +00:00
Mario Rodas
af4351ab85
Merge pull request from minijackson/init-shiori
Init shiori
2019-10-12 09:01:58 -05:00
Martin Weinelt
97d2959028
nixos/tests: add babeld 2019-10-12 15:35:53 +02:00
Florian Klink
696d1d8a86
Merge pull request from worldofpeace/pulseaudio-no-autospawn
nixos/pulseaudio: don't autospawn ever
2019-10-12 14:36:49 +02:00
Florian Klink
e24526d38e
Merge pull request from arianvp/fix-machinectl
nixos/systemd: Make machinectl work with NixOS
2019-10-12 14:12:44 +02:00
Joachim F
5bea2997fe
nixos/hardened: blacklist old filesystems ()
The rationale for this is that old filesystems have recieved little scrutiny
wrt. security relevant bugs.

Lifted from OpenSUSE[1].

[1]: 8cb42fb665

Co-Authored-By: Renaud <c0bw3b@users.noreply.github.com>
2019-10-12 10:08:44 +00:00
worldofpeace
361b5f7f65 nixos/pulseaudio: don't autospawn ever
This is long been superseded by socket activation.
Additonally using autospawn nudges some unpleasant
GDM related issues.
2019-10-11 21:41:15 -04:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
c0bw3b
1f7455cf0d nixos.tests: silence getfacl absolute path message
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.
2019-10-11 23:20:57 +02:00
Tor Hedin Brønner
5b7c900192
nixos/gdm: do not restart on reload switch ()
Not entirely sure how this works, but this does seem to fix reload switch
killing the current graphical session.
2019-10-11 20:07:16 +02:00
Florian Klink
1aad3acf15
nixos/gitlab: Don't print sensitive data to log on startup ()
nixos/gitlab: Don't print sensitive data to log on startup
2019-10-11 18:10:16 +02:00
Jan Tojnar
1739d34904
Merge pull request from jtojnar/nixos-rebuild-remote-fish
nixos-rebuild: Fix target-host using fish
2019-10-11 13:26:11 +02:00
Aaron Andersen
0b6067f93e
Merge pull request from Thra11/wacomtablet-kcm
wacomtablet: init at 3.2.0
2019-10-11 05:52:37 -04:00
Eelco Dolstra
9d0de0dc57
nix-daemon.nix: Shut up warning 2019-10-10 16:24:33 +02:00
Eelco Dolstra
27d2857a99
nix-daemon.nix: Use 'nix ping-store' to initialize directories 2019-10-10 16:24:33 +02:00
Eelco Dolstra
2c97f0669d
Typo 2019-10-10 16:24:33 +02:00