1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 16:42:09 +00:00
Commit graph

9680 commits

Author SHA1 Message Date
github-actions[bot] 9f69dadafd
Merge master into staging-next 2021-01-15 01:16:33 +00: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
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
github-actions[bot] 318e673af0
Merge master into staging-next 2021-01-13 06:40:30 +00: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
Michael White 952f2c76e0 nixos/clfswm: Restore working quicklisp package 2021-01-11 17:19:50 -07:00
github-actions[bot] 757ad34b82
Merge master into staging-next 2021-01-11 18:42:29 +00:00
Michele Guerini Rocco b1fb65a741
Merge pull request #101849 from rnhmjoj/searx
nixos/searx: declarative configuration
2021-01-11 18:17:10 +01:00
Jan Tojnar 2b9372b2ca
Merge branch 'master' into staging-next 2021-01-11 13:36:42 +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 623664e84f
nixos/searx: add support for running in uWSGI 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 88c998fb21
Merge branch 'staging-next' into staging 2021-01-10 23:24:57 +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
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
github-actions[bot] bd9e17e21f
Merge staging-next into staging 2021-01-10 18:41:46 +00: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
Phillip Cloud 53796fd70f nixos/prometheus: improve the tag_separator description 2021-01-10 13:08:48 -05:00
Phillip Cloud de96ffeb1c nixos/prometheus: use types.port for metrics port type 2021-01-10 13:08:48 -05:00
Phillip Cloud cad83fc596 nixos/prometheus: add cloud to refresh_interval description 2021-01-10 13:08:48 -05:00
Phillip Cloud 7958dbb8a7 nixos/prometheus: add gce_sd_configs scrapeConfig option 2021-01-10 13:08:47 -05:00
Griffin Smith ee12216b9b fprintd: Use cfg.package instead of pkgs.fprintd
Use the configured package for fprintd in services.dbus.packages and
environment.systemPackages rather than hardcoding pkgs.fprintd.
2021-01-10 11:29:43 -05:00
Frederik Rietdijk b209617ff0 plasma5Packages: alias to the libsForQt5 used to build the plasma5 desktop
For in NixOS it is beneficial if both plasma5 and pam use the same Qt5
version. Because the plasma5 desktop may use a different version as the
default Qt5 version, we introduce plasma5Packages.
2021-01-10 15:59:45 +01:00
Lorenzo Manacorda b6356c6e2e modules/tarsnap: document timestamp format 2021-01-10 16:47:15 +02:00
Maximilian Bosch ab278824ae
nixos/gitea: add ma27 as maintainer 2021-01-10 14:16:09 +01:00
Jörg Thalheim b815fb2fd9
Merge pull request #105775 from xaverdh/iwd-link-unit 2021-01-10 12:35:25 +00:00
sohalt 59bd4c1fea nixos/mpdscribble: init 2021-01-09 23:38:12 +01:00
WORLDofPEACE 7c34e83cb2
Merge pull request #108107 from talyz/reintroduce-epiphany
Revert "nixos/gnome3: don't install epiphany default"
2021-01-09 16:45:31 -05:00
Aaron Andersen 4b0a2ac72c
Merge pull request #99559 from JamieMagee/nzbhydra2
nzbhydra2: init at 3.8.0
2021-01-09 14:23:30 -05:00
Doron Behar 70d194c818
Merge pull request #107508 from Sohalt/mpd-credentials 2021-01-09 20:54:30 +02:00
Dominik Xaver Hörl 713b60460f nixos/iwd: add networkd link configuration matching the upstream .link unit file
It is meant to fix the race condition between iwd and udev trying to
rename the interface.
2021-01-09 10:26:57 +01:00