Commit graph

19773 commits

Author SHA1 Message Date
Milan f634c149e4
nixos/tests/docker: wait for docker service (#109418)
Previously the Docker daemon was started by systemd socket activation.
Thus, the Docker test waited for the sockets.target unit.
But when the docker module was changed to start the Docker daemon at
boot instead of by socket activation, the test was left untouched.
With the Docker 20.10 update this lead to a timing issue, where the
docker command is run before the Docker daemon has started and hangs.

Fixes #109416
2021-01-15 03:38:15 +01:00
Milan 4171cd53d6
redis: make masterAuth option optional (#109417) 2021-01-15 03:21:27 +01:00
Andreas Rammhold 3be09b94fb
Merge pull request #108860 from endocrimes/dani/fix-tmp
modules/boot: Specify the type for tmpfs mounts
2021-01-15 00:31:14 +01:00
Kevin Cox ddad87f26a
Merge pull request #108940 from Atemu/zfs-test-with-stable-linuxPackages
tests/zfs: test stable with stable linuxPackages
2021-01-14 17:09:02 -05:00
Kevin Cox 5666f34b28
Merge pull request #91813 from Mic92/types1
nixos/*: Add types to the database module options
2021-01-14 17:04:54 -05:00
Alyssa Ross 3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Michael Raskin 01372e6624
Merge pull request #109066 from michael-p-m-white/reenable-working-clfswm
Reenable working clfswm
2021-01-14 14:14:56 +00:00
Alyssa Ross 011d073393 nixos/postfix: deprecate services.postfix.useDane
Now that smtp_tls_security_level is using mkDefault, and therefore can
be overridden, there's no need for an option for overriding it to a
specific value.
2021-01-14 10:24:31 +00:00
Alyssa Ross 9ed5ee909b nixos/postfix: allow custom smtp_tls_security_level
I run Postfix on my workstation as a smarthost, where it only ever
talks to my SMTP server.  Because I know it'll only ever connect to
this server, and because I know this server supports TLS, I'd like to
set smtp_tls_security_level to "encrypt" so Postfix won't fall back to
an unencrypted connection.
2021-01-14 10:24:31 +00:00
Michele Guerini Rocco 721a4ecfa6
Merge pull request #109114 from illustris/searx
searx: 0.17.0 -> 0.18.0
2021-01-14 10:15:37 +01:00
rnhmjoj f741cccd45
nixos/searx: remove settings.yml merging script
Starting with 0.18.0, searx can merge the settings.yml automatically
with the default values, so the script is obsolete.
2021-01-14 09:48:02 +01:00
rnhmjoj 1013de19f1
nixos/searx: fix for 0.18.0 update 2021-01-14 09:48:01 +01:00
Sandro 7ab8f240ba
Merge pull request #109303 from ilian/fix/openldap-maintainers-typo
openldap: fix typo when specifying maintainers list
2021-01-14 07:43:50 +01:00
Silvan Mosberger ffdefb66c0
Merge pull request #108966 from pstn/murmurPswitch
nixos/murmur: Add overrideable package switch
2021-01-14 01:07:56 +01:00
sephalon 76fad08473
nixos/matrix-synapse: enable HTTPS in example (#109230)
The /.well-known endpoint must use HTTPS, see specification:
https://matrix.org/docs/spec/server_server/latest#resolving-server-names.
2021-01-13 22:20:17 +01:00
ilian 52a6cc02c5 openldap: fix typo in maintainers 2021-01-13 19:15:18 +01:00
adisbladis 4003f8cbc7
treewide: emacsPackages -> emacs.pkgs & emacsWithPackages -> emacs.pkgs.withPackages
The previous names are now aliases and shouldn't be used anywhere inside nixpkgs.
2021-01-13 17:13:10 +01:00
Vladimír Čunát 9e2880e5fa
nixos ISO image: revert another part of 8ca33835ba 2021-01-13 15:25:19 +01:00
Vladimír Čunát 1a16428c17
nixos ISO image: revert a part of 8ca33835ba
Thanks @ primeos.  This wasn't really needed; my mistake.
2021-01-13 14:50:40 +01:00
Vladimír Čunát 8ca33835ba
nixos: fixup build of aarch64 minimal ISO (fixes #109252)
Perhaps it's not pretty nor precise; feel free to improve.
2021-01-13 14:05:45 +01:00
Mark Vainomaa b451286b1f
docker: 19.03.4 -> 20.10.2 (#108960)
This commit refactors the build process to handle Docker engine and
CLI split.
2021-01-13 11:33:14 +01:00
Silvan Mosberger 0cd5058afd
Merge pull request #85842 from iblech/patch-whitebophir
whitebophir: init at 1.7.0 (package and service)
2021-01-13 03:06:34 +01:00
Ingo Blechschmidt 46292d7f86 nixos/whitebophir: init 2021-01-13 01:25:43 +01:00
Izorkin 91e580397e
mariadb: 10.4.15 -> 10.5.8 2021-01-12 17:22:54 +03:00
Izorkin d688f790dd
mariadb: drop build server with tokudb storage 2021-01-12 17:22:47 +03:00
Michael White 952f2c76e0 nixos/clfswm: Restore working quicklisp package 2021-01-11 17:19:50 -07:00
Graham Christensen 7092dd52f8
amazonImage: Upload disks as GP3 for cheaper & faster IO (#109027)
GP3 is always faster and cheaper than GP2, so sticking to GP2 is
leaving money on the table.

https://cloudwiry.com/ebs-gp3-vs-gp2-pricing-comparison/
2021-01-11 13:54:40 -05:00
Amine Chikhaoui ecf84de70c
ec2-amis: 2020-11-23 update (#104740) 2021-01-11 12:37:14 -05:00
Michele Guerini Rocco b1fb65a741
Merge pull request #101849 from rnhmjoj/searx
nixos/searx: declarative configuration
2021-01-11 18:17:10 +01:00
Eelco Dolstra 187af93c19
Merge pull request #78430 from puckipedia/fix-initrd-silent
nixos/stage-1: Do not allow missing kernel modules in initrd
2021-01-11 13:18:45 +01:00
Jörg Thalheim 89593ae987
Merge pull request #107895 from cpcloud/prom-gce-sd-config 2021-01-11 09:41:52 +00:00
rnhmjoj 88f71722ea
nixos/doc: add searx changes to the relase notes 2021-01-11 08:41:16 +01:00
rnhmjoj 623664e84f
nixos/searx: add support for running in uWSGI 2021-01-11 08:41:15 +01:00
rnhmjoj b7ca2d1448
nixos/tests: add searx test 2021-01-11 08:41:15 +01:00
rnhmjoj 7ec85073dd
nixos/ids: remove reserved searx ids 2021-01-11 08:41:15 +01:00
rnhmjoj cce415c743
nixos/searx: declarative configuration 2021-01-11 08:41:15 +01:00
Doron Behar 8addce8b60
Merge pull request #108981 from doronbehar/nixos/mpd
nixos/mpd: use credentials only if needed
2021-01-11 09:40:49 +02:00
Doron Behar 4ce7f28508 nixos/mpd: use credentials only if needed 2021-01-11 09:07:34 +02:00
Philipp 06c0f16555
nixos/murmur: Add overrideable package switch 2021-01-11 00:08:23 +01:00
Jan Tojnar dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
Florian Klink 581232454f
Merge pull request #108726 from omasanori/nixos/netgroup
nixos/networking: make /etc/netgroup by default
2021-01-10 23:01:12 +01:00
Guillaume Girol 0fbc0976db
Merge pull request #106082 from rnhmjoj/uwsgi
nixos/uwsgi: run with capabilities instead of root
2021-01-10 21:51:37 +00:00
Sandro d085417683
Merge pull request #108970 from xaverdh/pkgs-stdenv-lib
treewide: simplify pkgs.stdenv.lib -> pkgs.lib
2021-01-10 22:47:38 +01:00
Florian Klink 07f8292f88
Merge pull request #108844 from dadada/dadada/redis-unix-socket
nixos/redis: add test for unix socket access
2021-01-10 22:08:02 +01:00
adisbladis a7b1c82331
Merge pull request #108962 from glittershark/fprintd-use-cfg
fprintd: Use cfg.package instead of pkgs.fprintd
2021-01-10 21:45:14 +01:00
Dominik Xaver Hörl 25bef2d8f9 treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 20:12:06 +01:00
github-actions[bot] 76394e4624
Merge master into staging-next 2021-01-10 18:41:43 +00:00
rnhmjoj 3a17a9b05e
nixos/docs: add uWSGI changes to the relase notes 2021-01-10 19:33:41 +01:00
rnhmjoj 5597f6ded8
nixos/ihatemoney: run uwsgi emperor as normal user 2021-01-10 19:26:42 +01:00
Phillip Cloud cbe4de90af nixos/prometheus: remove unnecessary whitespace 2021-01-10 13:09:47 -05:00