Commit Graph

19816 Commits

Author SHA1 Message Date
github-actions[bot]
ef2abc20bc
Merge master into staging-next 2021-01-18 06:42:35 +00:00
Bernardo Meurer
e1340190a9
nixos/nomad: default enableDocker to true 2021-01-17 18:54:06 -08:00
Bernardo Meurer
1f8d0d771c
nixos/nomad: init
Co-authored-by: Niklas Hambüchen <mail@nh2.me>
2021-01-17 15:11:16 -08:00
Jörg Thalheim
1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD 2021-01-17 18:08:59 +01:00
WilliButz
254b510ce7
nixos/promtheus-nextcloud-exporter: update module and test
Use new command-line flags of release 0.3.0 and always answer with the
expected XML in the VM test instead of using a test-specific fixed path.

Co-authored-by: ajs124 <git@ajs124.de>
2021-01-17 15:25:18 +01:00
github-actions[bot]
9541eb734d
Merge master into staging-next 2021-01-17 12:38:49 +00:00
markuskowa
2756a5b4df
Merge pull request #109607 from alesguzik/improve_snapper_example
nixos/snapper: improve config example
2021-01-17 11:39:00 +01:00
Ales Huzik
6e65b724be nixos/snapper: improve config example
In the default configuration we have timers for creating and deleting
snapper snapshots, and it looks like if we just create configs with
correct mountpoints we will get automatic snapshots (which either
used to be true, or seems to be only true on Archlinux according to
their wiki). In default snapper configuration TIMELINE_CREATE and
TIMELINE_CLEANUP are set to "no", so just providing configs won't
be enough for having automatic backups, which are the main usecase
for snapper. In other linux distributions you would use `snapper
create-config` to generate configs for partitions and you'd have a
chance to notice that TIMELINE_CREATE is set to no. Also, my guess is
that it might be set to no by default for safety reasons in regular distros,
so that the config won't be actioned upon until the user finishes
customizing it.
2021-01-17 19:13:35 +11:00
github-actions[bot]
f46cb85082
Merge master into staging-next 2021-01-16 18:51:05 +00:00
Jörg Thalheim
21d78fa465
Merge pull request #109494 from ipetkov/nixos-zpool-trim-persistent-timer
nixos/zfs: make zpool-trim timer persistent
2021-01-16 13:20:18 +00:00
Aaron Andersen
6b0ba74baa
Merge pull request #109099 from jpotier/fix-deprecation-warning-azure-agent
nixos/azure-agent: fix deprecation warning
2021-01-16 07:52:05 -05:00
github-actions[bot]
2445824f40
Merge master into staging-next 2021-01-16 12:40:04 +00:00
Ivan Petkov
e2fa74dc68
nixos/zfs: make zpool-trim timer persistent
If the machine is powered off when the zpool-trim timer is supposed to
trigger (usually around midnight) then the timer will be skipped
outright in favor of the next instance.

For desktop systems which are usually powered off at this time, zpool
trimming will never be run which can degrade SSD performance.

By marking the timer as `Persistent = yes` we ensure that it will run at
the first possible opportunity after the trigger date is reached.
2021-01-15 20:23:16 -08:00
Domen Kožar
c32f5b22f1
move nixos-rebuild into pkgs 2021-01-15 20:07:38 +01:00
Jan Tojnar
c0d2951fa6
Merge branch 'master' into staging-next 2021-01-15 17:46:46 +01:00
Kevin Cox
bb96017198
Merge pull request #108932 from Atemu/iso-image-compress-filter
iso-image: enable XZ compress filter
2021-01-15 11:32:21 -05:00
Atemu
2fcab516c4 iso-image: enable XZ compress filter
Minimal ISO:
1m21 -> 2m25
625M -> 617M

Plasma5 ISO:
2m45 -> 5m18
1.4G -> 1.3G

Decompression speed stays about the same. It's just a few seconds for the whole
image anyways and, with that kind of speed, you're going to be bottlenecked by
IO long before the CPU.
2021-01-15 17:17:52 +01:00
Milan Pässler
4000091123
nixos/docker: change misleading error message
The socketActivation option was removed, but later on socket activation
was added back without the option to disable it. The description now reflects
that socket activation is used unconditionally in the current setup.
2021-01-15 15:00:11 +01:00
Mark Vainomaa
f53cf9a65c
Revert "nixos/tests/docker: wait for docker service"
This reverts commit c14bafd6c7db3b0c03574e28831821adda22a6f1.
2021-01-15 15:53:43 +02:00
Mark Vainomaa
a81c27cd54
docker: fix systemd socket activation 2021-01-15 15:53:31 +02:00
clerie
10eed48d10
nixos/gitea: make more secrets persistent (#108676)
Added JWT_SECRET and INTERNAL_TOKEN to be persistent, like SECRET_KEY and LFS_JWT_SECRET do. Also renamed some vars belonging to SECRET_KEY and LFS_JWT_SECRET to get a consistent naming scheme over all secrets.
2021-01-15 12:54:14 +01:00
Jörg Thalheim
f3042e3078
Merge pull request #108862 from cpcloud/refactor-nvidia-containers 2021-01-15 11:10:09 +00:00
Jörg Thalheim
9c4a18591f
Merge pull request #109096 from ju1m/tor
nixos/tor: fix openFirewall when ORPort isInt
2021-01-15 08:37:22 +00:00
github-actions[bot]
83c50873f5
Merge master into staging-next 2021-01-15 06:40:38 +00:00
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
github-actions[bot]
9f69dadafd
Merge master into staging-next 2021-01-15 01:16:33 +00: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
github-actions[bot]
183b673b64
Merge master into staging-next 2021-01-14 18:54:05 +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
github-actions[bot]
730ff71234
Merge master into staging-next 2021-01-14 12:42:20 +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
github-actions[bot]
d247d74ff9
Merge master into staging-next 2021-01-14 06:44:24 +00: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
Jan Tojnar
b813710c04
Merge branch 'master' into staging-next 2021-01-14 02:24:17 +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