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

misc: fix up after nixpkgs update

Browse source
This commit is contained in:
Luke Granger-Brown 2020-09-30 17:39:34 +00:00
parent 58f8944c92
commit 7b53535355
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/copybara.nix
View file

@ -17,8 +17,6 @@ pkgs.buildBazelPackage rec {
bazelFlags = [ bazelFlags = [
"--javabase=@local_jdk//:jdk" "--javabase=@local_jdk//:jdk"
"--host_javabase=@local_jdk//:jdk" "--host_javabase=@local_jdk//:jdk"
"--java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
"--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
]; ];
fetchAttrs = { fetchAttrs = {

8
ops/nixos/clouvider-fra01/default.nix
View file

@ -122,7 +122,7 @@ in {
deluge.extraGroups = [ "content" ]; deluge.extraGroups = [ "content" ];
sonarr.extraGroups = [ "deluge" "content" ]; sonarr.extraGroups = [ "deluge" "content" ];
radarr.extraGroups = [ "deluge" "content" ]; radarr.extraGroups = [ "deluge" "content" ];
}; } // (lib.setAttrByPath [ config.services.nginx.user "extraGroups" ] [ "acme" ]);
users.groups = { users.groups = {
content = {}; content = {};
}; };
@ -178,11 +178,7 @@ in {
domain = "*.int.lukegb.com"; domain = "*.int.lukegb.com";
dnsProvider = "cloudflare"; dnsProvider = "cloudflare";
credentialsFile = machineSecrets.cloudflareCredentials; credentialsFile = machineSecrets.cloudflareCredentials;
user = config.services.nginx.user; extraDomainNames = ["int.lukegb.com"];
group = config.services.nginx.group;
extraDomains = {
"int.lukegb.com" = null;
};
postRun = '' postRun = ''
systemctl reload nginx systemctl reload nginx
''; '';

1
ops/nixos/porcorosso/default.nix
View file

@ -175,7 +175,6 @@ in {
rxvt_unicode rxvt_unicode
teamspeak_client teamspeak_client
virtmanager virtmanager
virtmanager-qt
vulkan-tools vulkan-tools
xclip xclip
yubioath-desktop yubioath-desktop