diff --git a/nix/pkgs/copybara.nix b/nix/pkgs/copybara.nix index e2d7ece540..3018c57e08 100644 --- a/nix/pkgs/copybara.nix +++ b/nix/pkgs/copybara.nix @@ -17,8 +17,6 @@ pkgs.buildBazelPackage rec { bazelFlags = [ "--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 = { diff --git a/ops/nixos/clouvider-fra01/default.nix b/ops/nixos/clouvider-fra01/default.nix index a09a8efe83..c29e391fe3 100644 --- a/ops/nixos/clouvider-fra01/default.nix +++ b/ops/nixos/clouvider-fra01/default.nix @@ -122,7 +122,7 @@ in { deluge.extraGroups = [ "content" ]; sonarr.extraGroups = [ "deluge" "content" ]; radarr.extraGroups = [ "deluge" "content" ]; - }; + } // (lib.setAttrByPath [ config.services.nginx.user "extraGroups" ] [ "acme" ]); users.groups = { content = {}; }; @@ -178,11 +178,7 @@ in { domain = "*.int.lukegb.com"; dnsProvider = "cloudflare"; credentialsFile = machineSecrets.cloudflareCredentials; - user = config.services.nginx.user; - group = config.services.nginx.group; - extraDomains = { - "int.lukegb.com" = null; - }; + extraDomainNames = ["int.lukegb.com"]; postRun = '' systemctl reload nginx ''; @@ -211,4 +207,4 @@ in { }; system.stateVersion = "20.03"; -} \ No newline at end of file +} diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix index 51e9dae09a..0b24252b6d 100644 --- a/ops/nixos/porcorosso/default.nix +++ b/ops/nixos/porcorosso/default.nix @@ -175,7 +175,6 @@ in { rxvt_unicode teamspeak_client virtmanager - virtmanager-qt vulkan-tools xclip yubioath-desktop