lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

treewide: fix eval fallout from nixpkgs bump

Browse source
This commit is contained in:
Luke Granger-Brown 2022-03-11 14:56:55 +00:00
parent 8e65f7f0cc
commit 34fa21a171
6 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/heptapod-runner/default.nix
View file

@ -14,7 +14,7 @@ in
{ {
heptapod-runner = pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec { heptapod-runner = pkgs.gitlab-runner.overrideAttrs (oldAttrs: rec {
inherit version; inherit version;
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; buildInputs = (oldAttrs.buildInputs or []) ++ [ pkgs.makeWrapper ];
src = newSrc; src = newSrc;
patches = [ ./fix-shell-path.patch ]; patches = [ ./fix-shell-path.patch ];
}); });

1
ops/home-manager-ext.nix
View file

@ -24,6 +24,7 @@ let
configuration = { configuration = {
imports = [ value ]; imports = [ value ];
config._module.args.pkgs = lib.mkForce pkgs;
config.nixpkgs.config = pkgs.config; config.nixpkgs.config = pkgs.config;
config.home.sessionVariablesExtra = '' config.home.sessionVariablesExtra = ''
export PATH="$HOME/.nix-profile/bin''${PATH:+:}$PATH" export PATH="$HOME/.nix-profile/bin''${PATH:+:}$PATH"

32
ops/nixos/bvm-matrix/default.nix
View file

@ -119,17 +119,8 @@ in {
}; };
services.matrix-synapse = { services.matrix-synapse = {
enable = true; enable = true;
settings = {
server_name = "zxcvbnm.ninja"; server_name = "zxcvbnm.ninja";
macaroon_secret_key = machineSecrets.matrix.macaroonSecretKey;
registration_shared_secret = machineSecrets.matrix.registrationSecret;
turn_uris = [
"turns:matrix.zxcvbnm.ninja:3478?transport=udp"
"turns:matrix.zxcvbnm.ninja:3478?transport=tcp"
"turn:matrix.zxcvbnm.ninja:3478?transport=udp"
"turn:matrix.zxcvbnm.ninja:3478?transport=tcp"
];
turn_shared_secret = machineSecrets.turnSecret;
public_baseurl = "https://matrix.zxcvbnm.ninja/";
url_preview_enabled = true; url_preview_enabled = true;
url_preview_ip_range_blacklist = [ url_preview_ip_range_blacklist = [
"127.0.0.0/8" "127.0.0.0/8"
@ -144,7 +135,7 @@ in {
]; ];
listeners = [{ listeners = [{
port = 8008; port = 8008;
bind_address = "::1"; bind_addresses = [ "::1" ];
type = "http"; type = "http";
tls = false; tls = false;
x_forwarded = true; x_forwarded = true;
@ -153,11 +144,20 @@ in {
compress = false; compress = false;
}]; }];
}]; }];
extraConfig = '' turn_uris = [
form_secret: "${machineSecrets.matrix.formSecret}" "turns:matrix.zxcvbnm.ninja:3478?transport=udp"
experimental_features: "turns:matrix.zxcvbnm.ninja:3478?transport=tcp"
spaces_enabled: true "turn:matrix.zxcvbnm.ninja:3478?transport=udp"
''; "turn:matrix.zxcvbnm.ninja:3478?transport=tcp"
];
experimental_features.spaces_enabled = true;
public_baseurl = "https://matrix.zxcvbnm.ninja/";
macaroon_secret_key = machineSecrets.matrix.macaroonSecretKey;
registration_shared_secret = machineSecrets.matrix.registrationSecret;
turn_shared_secret = machineSecrets.turnSecret;
form_secret = machineSecrets.matrix.formSecret;
};
}; };
# Users allowed to use SSL certificate for matrix.zxcvbnm.ninja. # Users allowed to use SSL certificate for matrix.zxcvbnm.ninja.

1
ops/nixos/default.nix
View file

@ -8,6 +8,7 @@ let
baseModule = name: { ... }: { baseModule = name: { ... }: {
_module.args = args // { _module.args = args // {
rebuilder = rebuilder name; rebuilder = rebuilder name;
pkgs = lib.mkForce pkgs;
}; };
}; };
systemFor = systemName: config: systemFor = systemName: config:

2
ops/nixos/lib/graphical-client.nix
View file

@ -28,8 +28,6 @@ in
alsa.support32Bit = true; alsa.support32Bit = true;
jack.enable = true; jack.enable = true;
pulse.enable = true; pulse.enable = true;
media-session.enable = true;
}; };
security.rtkit.enable = true; security.rtkit.enable = true;

2
ops/nixos/lib/home-manager/client.nix
View file

@ -42,7 +42,7 @@ in
depot.nix.pkgs.common-updater-scripts depot.nix.pkgs.common-updater-scripts
go go
gopls gopls
goimports gotools
graphicsmagick-imagemagick-compat graphicsmagick-imagemagick-compat
vault vault
youtube-dl youtube-dl