1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00
Commit graph

16109 commits

Author SHA1 Message Date
Mario Rodas ffedd32f9f
Merge pull request #108511 from nagy/apache-lua-path-fix
nixos/httpd: fix lua paths
2021-02-11 20:04:42 -05:00
Daniel Nagy 7c121e60c5
nixos/httpd: fix lua paths
Account for the fact that, when creating a lua package without the
"withPackages" helper, we dont get an extra "lua" attribute in the
package.

Therefore we need to distinguish between the "withPackages" case and the
direct ( or "empty" ) lua package.

For example with this nixos config:

```nix
{
  services.httpd = {
      enable = true;
      package = pkgs.apacheHttpd.override {
        luaSupport = true;
        lua5 = pkgs.lua5_3.withPackages (ps: with ps; [ luafilesystem ] );
      };
    };
}
```

Here we say that we want to have apache to use a lua, packaged with the
`luafilesystem` module so that we can `require` that in scripts to
render http responses. There, the set that gets assigned to `lua5 ` does
not have a `luaversion` attribute, rather it has a `lua` attribute
wherein lies a `luaversion` attribute. If we dont package additional
modules, then we dont have that `lua` attribute in between and rather
directly have to use `luaversion` directly.
2021-02-11 11:56:06 +01:00
Linus Heckemann e4cf0e7a45
Merge pull request #109345 from cole-h/zfs-closure
Shrink the ZFS closure by making mail support optional
2021-02-10 23:04:24 +01:00
Finn Behrens 92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
Robert Hensing 696294ea9f Improve todo 2021-02-10 10:36:00 +01:00
Robert Hensing 460ba46a4a nixos/hercules-ci-agent: Add myself to meta.maintainers 2021-02-10 09:50:27 +01:00
Robert Hensing 0c22957751 nixos/hercules-ci-agent: Improve concurrentTasks option doc 2021-02-10 09:49:57 +01:00
Robert Hensing fbabab7b16 nixos/hercules-ci-agent: Format with nixpkgs-fmt 2021-02-10 09:49:21 +01:00
Aaron Andersen 5473527775
Merge pull request #111312 from fdietze/patch-2
herbstluftwm: Add option to specify package
2021-02-09 20:13:03 -05:00
Felix Dietze 5a827051aa herbstluftwm: Add option to specify package 2021-02-09 08:51:21 -01:00
Martin Weinelt 2b454fcefd
Merge pull request #112391 from serokell/zhenya/oauth2-proxy-multiple-hosts
nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
2021-02-09 02:37:03 +01:00
Bernardo Meurer c83a3d6fa7
Merge pull request #112335 from lovesegfault/firefox-no-flash
treewide: cleanup Adobe Flash Player
2021-02-09 01:35:24 +00:00
Martin Weinelt 47901b544c
Merge pull request #111302 from fooker/pr/nginx-default-type
nixos/nginx: serve unknown MIME-Types as binary
2021-02-09 01:44:47 +01:00
Jan Tojnar faf133f854
Merge pull request #97972 from mvnetbiz/power-profiles-daemon 2021-02-09 01:41:04 +01:00
Matt Votava 9a3190a960
power-profiles-daemon: init at 0.1, add service module 2021-02-09 01:25:56 +01:00
Guillaume Girol 2630a2df91
Merge pull request #108238 from snicket2100/more-dnscrypt-proxy-hardening
nixos/dnscrypt-proxy2: more service hardening
2021-02-08 19:22:44 +00:00
Robert Hensing 094362a35a
Merge pull request #112154 from hercules-ci/nixos-hercules-ci-agent-remove-patchNix
nixos/hercules-ci-agent: Remove patchNix
2021-02-08 19:21:00 +01:00
Bernardo Meurer ecaefda84a
nixos.flashpolicyd: drop 2021-02-08 09:38:48 -08:00
Zhenya Vinogradov cc26d8592f nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
Fixes redirection after signing in when you use a single oauth2_proxy
instance for multiple domains.

X-Auth-Request-Redirect header is used to decide which URL to redirect
to after signing in. Specifying `request_uri` is enough in case you
need to redirect to the same domain that serves oauth2 callback
endpoint, but with multiple domains the you should include the scheme
and the host.
2021-02-08 15:28:52 +03:00
Michele Guerini Rocco c9f6a7f349
Merge pull request #111624 from rnhmjoj/thinkfan
nixos/thinkfan: rewrite for 1.2 update
2021-02-08 12:20:07 +01:00
WilliButz bfa15ad956
Merge pull request #112351 from logan12358/prometheus-nginx-exporter-service
nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled
2021-02-08 11:54:13 +01:00
Logan Glasson c6ec272c78 nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled
On a system with nginx enabled but the prometheus exporter not enabled,
the prometheus-nginx-exporter service should not be created.
2021-02-08 13:17:56 +13:00
Eric Bailey 35056b3b61 maintainers/teams: add beam team 2021-02-07 13:01:11 -06:00
Sandro a64370c164
Merge pull request #112295 from thelegy/snapserver-fix-buffer-options
nixos/snapserver: Fix buffer options not coercible to str
2021-02-07 17:10:34 +01:00
rnhmjoj 02b872310d
nixos/thinkfan: rewrite for 1.2 update
Thinkfan underwent some major changes and the config file
is now based on YAML. This commit contains a number of changes:

- rewrite the module to output the new format;
- add a `settings` option, following RFC 0042[1];
- add fancy type-checking for the most critical options
- use upstream systemd units (which fix the resume issue)

[1]: https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
2021-02-07 14:35:36 +01:00
Jan Beinke 58d49db69d nixos/snapserver: Fix buffer options not coercible to str 2021-02-07 12:53:27 +01:00
Michele Guerini Rocco 237d5fa67a
Merge pull request #111452 from urbas/linuxPackages_rpi3-missing-ahci-module
system/boot: add includeDefaultModules option
2021-02-07 12:33:51 +01:00
Matej Urbas 2c769d7a6a system/boot: add includeDefaultModules option 2021-02-07 11:14:36 +00:00
Cole Helbling 1ed5b6a285
zfs: disable smartmontools mail functionality 2021-02-06 22:04:00 -08:00
Cole Helbling 370df31f1c
nixos/zfs: make zed mail optional
"zed does not need the ability to send email by default" --Eelco
2021-02-06 22:03:59 -08:00
Maximilian Bosch 31b1137c1d
Merge pull request #112013 from Ma27/nextcloud-file-check
nixos/nextcloud: fail early if {admin,db}passFile is not readable
2021-02-06 21:56:03 +01:00
Michele Guerini Rocco 75156546fc
Merge pull request #111996 from rnhmjoj/i2c
nixos/i2c: add module to set up i2c permissions
2021-02-06 18:22:34 +01:00
Robert Hensing c808983caa nixos/hercules-ci-agent: Remove patchNix 2021-02-06 15:35:42 +01:00
rnhmjoj afde028672
nixos/i2c: add module to set up i2c permissions
This is a very simple module that installs a single udev rule.
The rule set the ownership of all /dev/i2c-* devices to a
group, "i2c" by default but can be changed. The "uaccess" tag
also makes systemd add an ACL for users with a seat[1].

Fix issue #91771

[1]: https://enotty.pipebreaker.pl/2012/05/23/linux-automatic-user-acl-management/
2021-02-06 15:08:13 +01:00
adisbladis 6caa6cb3f5
Merge pull request #111924 from saschagrunert/cri-o-oci-hook
nixos/cri-o: add OCI seccomp bpf hook support
2021-02-06 12:03:44 +01:00
adisbladis 3c6035cd9a
Merge pull request #106767 from erikarvstedt/fix-container-pkgs-2
nixos-container: fix `nixpkgs` container options being ignored
2021-02-06 11:57:14 +01:00
Scriptkiddi a0fa916147 nixos/venus: Dropping module 2021-02-05 22:53:23 -08:00
Michael Raskin e248519cb9
Merge pull request #104003 from felschr/feat/etebase-server
etebase-server: init at 0.7.0
2021-02-05 21:37:34 +00:00
Alexandre Macabies 255882fbcc nixos/snapserver: add AF_NETLINK to allowed address families
This is necessary for Librespot, which is spawned by snapserver in the
same cgroup. Librespot requires querying local ip links and addresses
for MDNS (Zeroconf/Avahi), and does so through NETLINK interface.
2021-02-05 19:23:25 +01:00
Alexandre Macabies a36cc03d96 nixos/snapserver: update available stream types for v0.21.0
* Add 'librespot' (new name for 'spotify'), 'alsa', 'tcp'.
* Add a warning about the spotify -> librespot rename.
* Fix the deprecated example `mode = "listen"` for type 'pipe'.
* Update the tests to include a straightforward 'tcp' test.
2021-02-05 19:23:24 +01:00
Kevin Cox 48f6dbe1f8
Merge pull request #109065 from Technical27/add-auto-cpufreq-module
nixos/auto-cpufreq: init module
2021-02-05 13:15:13 -05:00
ajs124 536fe36e23
Merge pull request #112050 from helsinki-systems/revert-111456-top-level
Revert "nixos/top-level: add specialisation.<name>.configuration type"
2021-02-05 18:12:51 +01:00
Jan Tojnar 493bbc968b
Merge pull request #95337 from pasqui23/switchctl 2021-02-05 18:05:39 +01:00
Fritz Otlinghaus 56c42142ed Revert "nixos/top-level: add specialisation.<name>.configuration type"
This reverts commit 05fbc82771.
2021-02-05 17:49:06 +01:00
Pasquale f5f9a069d9
nixos/switcheroo-control: added nixos option
node/switcheroo-control: better formatting
2021-02-05 17:39:44 +01:00
Maximilian Bosch 778238c6b1
Merge pull request #109144 from sephalon/nextcloud-service-doc
nixos/nextcloud: document adminpassFile permissions
2021-02-05 12:54:59 +01:00
Maximilian Bosch f4817027c1
nixos/nextcloud: fail early if {admin,db}passFile is not readable
Otherwise `nextcloud-setup.service` fails during the installation and
thus leaves a corrupted state.
2021-02-05 12:34:08 +01:00
Sascha Grunert e2b7bdd08d
nixos/cri-o: add OCI seccomp bpf hook support
We now set the hooks dir correctly if the OCI hook is enabled. CRI-O
supports this specific hook from v1.20.0.

Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2021-02-05 11:04:49 +01:00
Scriptkiddi 4cf63ef007
nixos/cdemu: add types 2021-02-05 10:39:25 +01:00
Ben Wolsieffer f413b2bc51 Revert "nixos/kernel.nix: ensure same kernel is used"
This reverts commit 78f915a002.
2021-02-03 20:31:22 -05:00