maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays (2024-07-28)

Browse source 
* Treewide: re-run depotfmt

* //third_party/nixpkgs:html5validator: build with Python 3.11,
  dependency openstackdocstheme doesn't support 3.12

* //users/sterni/machines/ingeborg: adapt to poorly handled fcgiwrap
  module API change: https://github.com/NixOS/nixpkgs/pull/318599

* //tvix/*-go: regenerate protobuf files

* //third_party/nixpkgs:treefmt: Remove patch for merged pull request

* //users/flokli/ipu6-softisp: rebase, drop upstreamed kernel patches

Change-Id: Ie4e0df007c287e8cd6207683a9a25838aa5bd39a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11971
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
Aspen Smith 2024-07-28 12:58:22 -04:00 • committed by clbot
parent bdf8269859
commit 756539a596
50 changed files with 281 additions and 22463 deletions
Download patch file Download diff file Expand all files Collapse all files

16
users/sterni/machines/ingeborg/http/code.sterni.lv.nix
View file

@ -167,10 +167,22 @@ in
{
imports = [
./nginx.nix
./fcgiwrap.nix
];
config = {
services.fcgiwrap.cgit = {
process = {
user = "http";
group = "http";
};
# Default value doesn't work as documented
# https://github.com/NixOS/nixpkgs/pull/318599/files#r1673885083
socket = {
user = "http";
group = "http";
};
};
services.nginx.virtualHosts."${virtualHost}" = {
enableACME = true;
forceSSL = true;
@ -185,7 +197,7 @@ in
fastcgi_param QUERY_STRING $args;
fastcgi_param HTTP_HOST $server_name;
fastcgi_param CGIT_CONFIG ${cgitConfig};
fastcgi_pass unix:${toString config.services.fcgiwrap.socketAddress};
fastcgi_pass unix:${toString config.services.fcgiwrap.cgit.socket.address};
}
'';
};

15
users/sterni/machines/ingeborg/http/fcgiwrap.nix
View file

@ -1,15 +0,0 @@
{ ... }:
{
imports = [
./nginx.nix
];
config.services.fcgiwrap = {
enable = true;
socketType = "unix";
socketAddress = "/run/fcgiwrap.sock";
user = "http";
group = "http";
};
}