3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

21046 commits

Author SHA1 Message Date
github-actions[bot] b57b2b362c
Merge master into staging-next 2021-04-18 18:10:37 +00:00
Sandro b0b878ad56
Merge pull request #119788 from jojosch/dnsdist-configfile-name
nixos/dnsdist: dndist.conf -> dnsdist.conf
2021-04-18 19:24:20 +02:00
sternenseemann f85086f6c3 nixos/tests/packagekit: fix test machine evaluation
aa22be179a dropped the backend setting
which was used in the test, breaking evaluation of the test in the
process. Kind of defeats the purpose of a test if it isn't executed
before merging a change to a module…
2021-04-18 18:40:06 +02:00
Johannes Schleifenbaum dc282fc3f3
nixos/dnsdist: dndist.conf -> dnsdist.conf 2021-04-18 13:34:28 +02:00
github-actions[bot] 8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
Jörg Thalheim fc02b14738
Merge pull request #117071 from mohe2015/hotfix-zfs-grub
nixos/zfs: Fix regression that prevents people to boot from zfs using grub if they didn't add zfs to boot.initrd.supportedFilesystems
2021-04-17 16:01:22 +01:00
github-actions[bot] 425886d6c2
Merge master into staging-next 2021-04-17 12:05:49 +00:00
Florian Klink 6c961dddd1 nixos/nullmailer: set isSystemUser
setting users.users.name.{isSystemUser,isNormalUser} is required since #115332
2021-04-17 12:29:51 +02:00
github-actions[bot] 1b82d09a50
Merge master into staging-next 2021-04-17 06:05:23 +00:00
Alyssa Ross cc10432418
mailman: add myself as a maintainer all around 2021-04-17 01:07:38 +00:00
Martin Weinelt e5cc06a1e8
Merge pull request #119191 from NixOS/revert-118719-home-assistant-tests 2021-04-17 02:35:05 +02:00
Aaron Andersen 3041a85897
Merge pull request #111951 from f4814/add-quake3-module
nixos/quake3-server: Init
2021-04-16 20:20:18 -04:00
Robert Schütz 1d9f619311
nixos/home-assistant: warn about overridePythonAttrs in package option 2021-04-17 02:20:07 +02:00
github-actions[bot] f620e30ca4
Merge master into staging-next 2021-04-17 00:15:03 +00:00
Sandro 0139874db9
nixos/nginx: add upstreams examples (#118447)
* nixos/nginx: add upstreams examples

I am not fully sure if they are fully correct but they deployed the right syntax.

* nixos/nginx: use literal example

* Update nixos/modules/services/web-servers/nginx/default.nix

* Update nixos/modules/services/web-servers/nginx/default.nix
2021-04-17 00:25:03 +02:00
Jörg Thalheim 0854659567
Merge pull request #119389 from marsam/drop-postgresql_9_5
postgresql_9_5: drop
2021-04-16 19:29:21 +01:00
github-actions[bot] 6a0f49f240
Merge master into staging-next 2021-04-16 18:13:19 +00:00
sternenseemann ecfd3d4c53 nixos/services/matrix-synapse: fix eval errors in manual example 2021-04-16 18:13:42 +02:00
Kim Lindberger 7124e24a47
Merge pull request #119596 from talyz/discourse-2.6.5
discourse: 2.6.3 -> 2.6.5, module fixes
2021-04-16 16:06:47 +02:00
talyz 7310dd0da8
nixos/discourse: Fix plugin linking
When linking multiple plugins, the `ln` runs need to be separated by
newlines..

Fixes #119584.
2021-04-16 14:21:07 +02:00
talyz 515fb48312
nixos/discourse: Fail on file errors
Bash doesn't handle subshell errors properly if the result is used as
input to a command. To cause the services to fail when the files can't
be read, we need to assign the value to a variable, then export it
separately.
2021-04-16 14:21:01 +02:00
github-actions[bot] d4f421cad9
Merge master into staging-next 2021-04-16 12:06:14 +00:00
Felix Tenley c25e8e8c96 nixos/etebase-server: do not prompt for input during automatic upgrade 2021-04-16 13:08:42 +02:00
Milan Pässler 2ed0f723c7 nixos/mailman: add http listener for uwsgi
With the config suggested in the module docs both Mailman core and
Hyperkitty are running, but Mailman core can not connect to Hyperkitty,
since the default hyperkitty.baseUrl is not set up by the module.

This adds a http listener to the uwsgi config and changes the default
hyperkitty.baseUrl to connect to this http listener.
2021-04-16 12:16:12 +02:00
Robert Hensing 578acc7a42
Merge pull request #118018 from considerate/master
dockerTools: Implement merging of image tarballs
2021-04-16 09:17:44 +02:00
Guillaume Girol f02d9c6626
Merge pull request #119582 from helsinki-systems/fix/dovecot-systemUser
nixos/dovecot: set isSystemUser for mailUser
2021-04-16 07:10:19 +00:00
Jörg Thalheim ec050f16d4
Merge pull request #119238 from xfix/revert-no-longer-necessary-systemd-bug-workaround
Revert "nixos/systemd: provide libidn2 for systemd-resolved"
2021-04-16 07:41:39 +01:00
Martin Weinelt cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
ajs124 90f6033984 nixos/tests/dovecot: set mailUser and mailGroup 2021-04-16 00:43:11 +02:00
ajs124 6637ce9fd8 nixos/dovecot: set isSystemUser for mailUser
needed after 7a87973b4c
2021-04-16 00:42:43 +02:00
Felix Tenley 004e80f8ae nixos/etebase-server: set users.users.etebase-server.isSystemUser
- setting users.users.name.{isSystemUser,isNormalUser} is required since
  #115332
2021-04-15 21:49:50 +02:00
github-actions[bot] dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
Graham Christensen ffd29c76f6
Merge pull request #117928 from ymatsiuk/fprintd-tod
nixos/fprintd: add TOD support
2021-04-15 11:51:09 -04:00
Yurii Matsiuk b29ed56049
nixos/fprintd: add TOD support
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
2021-04-15 08:55:39 +02:00
github-actions[bot] 8b35f0c117
Merge master into staging-next 2021-04-15 06:05:40 +00:00
figsoda 2f6a9bb297 nixos/programs/fish: add shellAbbrs config 2021-04-14 17:37:14 -07:00
Martin Weinelt 7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Guillaume Girol f1a2ab6818
Merge pull request #115332 from symphorien/usertype
nixos/users: require one of users.users.name.{isSystemUser,isNormalUser}
2021-04-14 19:38:26 +00:00
Symphorien Gibol 7a87973b4c nixos/users: require one of users.users.name.{isSystemUser,isNormalUser}
As the only consequence of isSystemUser is that if the uid is null then
it's allocated below 500, if a user has uid = something below 500 then
we don't require isSystemUser to be set.

Motivation: https://github.com/NixOS/nixpkgs/issues/112647
2021-04-14 20:40:00 +02:00
github-actions[bot] eb8e023674
Merge master into staging-next 2021-04-14 18:11:01 +00:00
Alyssa Ross 912e11a468 mailman-web: 2019-09-29 -> 2021-04-10
* Make it clearer what code comments apply to
* Fix the state directory (this was changed in the update)
* Add m1cr0man as a maintaner

Co-authored-by: Lucas Savva <lucas@m1cr0man.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-14 16:23:09 +00:00
Kim Lindberger 59917dc3a9
Merge pull request #119427 from talyz/tengine-modules
tengine: Add modules to passthru
2021-04-14 17:42:01 +02:00
talyz 06dee38345
Revert "nixos/nginx: fix eval for tengine"
This reverts commit 2d3200e010.
2021-04-14 16:34:10 +02:00
Alyssa Ross d0ead9021e
Revert "mailman-web-unstable: 2019-09-29 -> 2021-04-10 (#119135)"
This reverts commit 8dbd553792.

The update has changed where mailman-web looks for its database and
broken the Mailman module in NixOS.
2021-04-14 12:18:44 +00:00
github-actions[bot] 963ba38ad9
Merge master into staging-next 2021-04-14 12:06:11 +00:00
Florian Klink 950e92cac1
Merge pull request #119368 from flokli/rl-systemd-mutable
rl-2105: Document /etc/systemd-mutable/system -> boot.extraSystemdUnitPaths
2021-04-14 12:55:36 +02:00
Florian Klink 5429cc1af4 rl-2105: Document /etc/systemd-mutable/system is gone from the defaults, point to boot.extraSystemdUnitPaths 2021-04-14 12:52:58 +02:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Jörg Thalheim 2a48ef1426
Merge pull request #103228 from ThinkChaos/fix_k3s_start
nixos/k3s: Update service to match upstream
2021-04-14 09:01:33 +01:00
Martin Weinelt 485034873f Revert "nixos/home-assistant: use overridePythonAttrs"
This reverts commit f9bd8b1b7b.
2021-04-13 22:46:36 +02:00