colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-09-06 -> 2024-09-08

Browse Source
This commit is contained in:
Colin
2024-09-08 20:35:58 +00:00
parent 0d6a823382
commit bb18f65ed2
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/by-name/servo/services/matrix/default.nix
View File

@@ -11,7 +11,7 @@
# - `curl --header "Authorization: Bearer <your_access_token>" --data '{ "app_display_name": "<topic>", "app_id": "ntfy.uninsane.org", "data": { "url": "https://ntfy.uninsane.org/_matrix/push/v1/notify", "format": "event_id_only" }, "device_display_name": "<topic>", "kind": "http", "lang": "en-US", "profile_tag": "", "pushkey": "<topic>" }' localhost:8008/_matrix/client/v3/pushers/set` # - `curl --header "Authorization: Bearer <your_access_token>" --data '{ "app_display_name": "<topic>", "app_id": "ntfy.uninsane.org", "data": { "url": "https://ntfy.uninsane.org/_matrix/push/v1/notify", "format": "event_id_only" }, "device_display_name": "<topic>", "kind": "http", "lang": "en-US", "profile_tag": "", "pushkey": "<topic>" }' localhost:8008/_matrix/client/v3/pushers/set`
# - delete a notification destination by setting `kind` to `null` (otherwise, request is identical to above) # - delete a notification destination by setting `kind` to `null` (otherwise, request is identical to above)
# #
{ config, lib, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [

15
hosts/by-name/servo/services/matrix/irc.nix
View File

@@ -1,6 +1,6 @@
# config docs: # config docs:
# - <https://github.com/matrix-org/matrix-appservice-irc/blob/develop/config.sample.yaml> # - <https://github.com/matrix-org/matrix-appservice-irc/blob/develop/config.sample.yaml>
{ config, lib, ... }: { lib, ... }:
let let
ircServer = { name, additionalAddresses ? [], ssl ? true, sasl ? true, port ? if ssl then 6697 else 6667 }: let ircServer = { name, additionalAddresses ? [], ssl ? true, sasl ? true, port ? if ssl then 6697 else 6667 }: let
@@ -128,6 +128,7 @@ in
ircService = { ircService = {
logging.level = "warn"; # "error", "warn", "info", "debug" logging.level = "warn"; # "error", "warn", "info", "debug"
mediaProxy.publicUrl = "https://irc.matrix.uninsane.org/media";
servers = { servers = {
"irc.esper.net" = ircServer { "irc.esper.net" = ircServer {
name = "esper"; name = "esper";
@@ -168,4 +169,16 @@ in
# the service actively uses at least one of these, and both of them are fairly innocuous # the service actively uses at least one of these, and both of them are fairly innocuous
SystemCallFilter = lib.mkForce "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @setuid @swap"; SystemCallFilter = lib.mkForce "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @setuid @swap";
}; };
services.nginx.virtualHosts."irc.matrix.uninsane.org" = {
forceSSL = true;
enableACME = true;
locations."/media" = {
proxyPass = "http://127.0.0.1:11111";
};
};
sane.dns.zones."uninsane.org".inet = {
CNAME."irc.matrix" = "native";
};
} }

14
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}: }:
let let
lock = { lock = {
master.rev = "4f213fe612e1eb452467d0395be7c83ba0f8ddac"; master.rev = "17fb773308a8558abaa05b5df71cdaf3e5208e66";
master.sha256 = "sha256-JQqgzI/Fdbn/V7oamZem+9CasvzfMtPtfCJzejW/as8="; master.sha256 = "sha256-+q9YZ4HWL50epIkN7o25UmiPx9kHylkpwMwF2ynSdcc=";
staging.rev = "4f213fe612e1eb452467d0395be7c83ba0f8ddac"; staging.rev = "17fb773308a8558abaa05b5df71cdaf3e5208e66";
staging.sha256 = "sha256-JQqgzI/Fdbn/V7oamZem+9CasvzfMtPtfCJzejW/as8="; staging.sha256 = "sha256-+q9YZ4HWL50epIkN7o25UmiPx9kHylkpwMwF2ynSdcc=";
staging-next.rev = "4f213fe612e1eb452467d0395be7c83ba0f8ddac"; staging-next.rev = "17fb773308a8558abaa05b5df71cdaf3e5208e66";
staging-next.sha256 = "sha256-JQqgzI/Fdbn/V7oamZem+9CasvzfMtPtfCJzejW/as8="; staging-next.sha256 = "sha256-+q9YZ4HWL50epIkN7o25UmiPx9kHylkpwMwF2ynSdcc=";
}; };
lock' = lock."${variant}"; lock' = lock."${variant}";
unpatchedSrc = fetchzip { unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: { src.overrideAttrs (base: {
# attributes needed for update scripts # attributes needed for update scripts
pname = "nixpkgs"; pname = "nixpkgs";
version = "24.05-unstable-2024-09-06"; version = "24.05-unstable-2024-09-08";
passthru = (base.passthru or {}) // nixpkgs // { passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // { src = unpatchedSrc // {
inherit (lock') rev; inherit (lock') rev;