mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Code Issues Wiki Activity
270041 commits 256 branches 124 tags 5.2 GiB
Commit graph

20261 commits

Author SHA1 Message Date
github-actions[bot] 53c1035b44
Merge staging-next into staging 2021-02-12 12:20:24 +00:00
github-actions[bot] 15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
Florian Klink 53a0c2878b
Merge pull request #111786 from flokli/systemd-247.3 
systemd: 247.2 -> 247.3
 2021-02-12 12:52:49 +01:00
Michael Raskin 27f172ebd1
Merge pull request #112019 from 7c6f434c/fix-service-runner 
nixos/service-runner: fix evaluation
 2021-02-12 08:50:52 +00:00
Peter Hoeg 04e9e9e510 nixos/captive-browser: make it work without a fixed interface 
nixpkgs-fmt makes this a lot noisier than it has to be
 2021-02-12 14:35:51 +08:00
github-actions[bot] 1551e9d6ee
Merge master into staging-next 2021-02-12 06:16:24 +00:00
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
github-actions[bot] 344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
Kevin Cox 4a22f8aa88
Merge pull request #112660 from turion/dev_test_vscodium 
tests/vscodium: Fix race condition
 2021-02-11 17:49:14 -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
github-actions[bot] 5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00: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
github-actions[bot] 7d94bb26bb
Merge master into staging-next 2021-02-10 18:16:36 +00:00
Manuel Bärenz 037d0489ca tests/vscodium: Fix race condition 2021-02-10 16:38:13 +01:00
Finn Behrens 92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
github-actions[bot] bb5521a62c
Merge master into staging-next 2021-02-10 12:20:06 +00: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
github-actions[bot] 459eb2d924
Merge master into staging-next 2021-02-10 06:16:56 +00: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
github-actions[bot] 8064cff79c
Merge master into staging-next 2021-02-09 18:16:33 +00:00
Ben Siraphob e605e6205f power-profiles-daemon: pkgs.stdenv.lib -> pkgs.lib 2021-02-09 18:24:09 +07:00
Felix Dietze 5a827051aa herbstluftwm: Add option to specify package 2021-02-09 08:51:21 -01:00
github-actions[bot] 30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00: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
github-actions[bot] 5704fd1095
Merge master into staging-next 2021-02-09 00:36:17 +00:00
Matt Votava 65968a1f59
power-profiles-daemon: add test 2021-02-09 01:25:57 +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
github-actions[bot] 1848e071c9
Merge master into staging-next 2021-02-08 18:17:03 +00:00
Bernardo Meurer 77a76e2ff8
release-notes/rl-2103: mention removal of flashplayer support from tree 2021-02-08 09:40:20 -08:00
Bernardo Meurer ecaefda84a
nixos.flashpolicyd: drop 2021-02-08 09:38:48 -08:00
Manuel Bärenz 10b3773db0 vscode/vscodium: Add integration test 2021-02-08 13:59:37 +01: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
github-actions[bot] bef005163c
Merge master into staging-next 2021-02-08 12:19:33 +00: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
Jörg Thalheim c538a83d7c
Merge pull request #110623 from yurrriq/beam-team 2021-02-08 06:48:14 +00:00
github-actions[bot] 1c86cb40e9
Merge master into staging-next 2021-02-08 00:36:16 +00: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
Jan Beinke c4b5a703ab
tests/snapserver: Add test of connection and buffer size setting 
This addition will cover part of the issue, that was fixed in #112295
and @mweinelt asked to improve the tests.
 2021-02-07 23:43:59 +01:00
Eric Bailey 35056b3b61 maintainers/teams: add beam team 2021-02-07 13:01:11 -06:00
github-actions[bot] 2226996f6c
Merge master into staging-next 2021-02-07 18:16:08 +00: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