meta: reduce overlay usage

This commit is contained in:
Max Headroom 2022-07-31 22:36:07 +02:00
parent 5498b09cf2
commit 8d4fabf934
5 changed files with 8 additions and 6 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, tools, ... }: { config, inputs, lib, pkgs, tools, ... }:
let let
inherit (tools.meta) domain; inherit (tools.meta) domain;
in in
@ -53,6 +53,7 @@ in
services.hydra = { services.hydra = {
enable = true; enable = true;
package = inputs.self.packages.${pkgs.system}.hydra;
hydraURL = "https://hydra.${domain}"; hydraURL = "https://hydra.${domain}";
inherit (config.links.hydra) port; inherit (config.links.hydra) port;
notificationSender = "hydra@${domain}"; notificationSender = "hydra@${domain}";

View file

@ -26,6 +26,7 @@ in
}; };
services.keycloak = { services.keycloak = {
enable = true; enable = true;
package = inputs.self.packages.${pkgs.system}.keycloak;
database = { database = {
createLocally = true; createLocally = true;
type = "postgresql"; type = "postgresql";

View file

@ -1,18 +1,13 @@
{ pkgs, lib, config, inputs, ... }: { pkgs, lib, config, inputs, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { flakePackages = inputs.self.packages.${pkgs.system}; })
(self: super: (self: super:
(let (let
patched = import ../../packages/patched-derivations.nix super; patched = import ../../packages/patched-derivations.nix super;
in { in {
hydra-unstable = patched.hydra;
inherit (patched) sssd tempo; inherit (patched) sssd tempo;
jre = patched.jre17_standard;
jre_headless = patched.jre17_standard; jre_headless = patched.jre17_standard;
}) })

View file

@ -29,6 +29,10 @@ super: rec {
}; };
in jre // { meta = jre.meta // { inherit (super.jdk17_headless.meta) platforms; }; }; in jre // { meta = jre.meta // { inherit (super.jdk17_headless.meta) platforms; }; };
keycloak = super.keycloak.override {
jre = jre17_standard;
};
oauth2-proxy = patch super.oauth2-proxy "patches/base/oauth2-proxy"; oauth2-proxy = patch super.oauth2-proxy "patches/base/oauth2-proxy";
tempo = super.tempo.overrideAttrs (_: { tempo = super.tempo.overrideAttrs (_: {

View file

@ -1,5 +1,6 @@
{ {
packages = { packages = {
keycloak = [ "x86_64-linux" ];
uptime-kuma = [ "x86_64-linux" ]; uptime-kuma = [ "x86_64-linux" ];
}; };
checks = { checks = {