meta: reduce overlay usage
This commit is contained in:
parent
5498b09cf2
commit
8d4fabf934
5 changed files with 8 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, config, tools, ... }:
|
||||
{ config, inputs, lib, pkgs, tools, ... }:
|
||||
let
|
||||
inherit (tools.meta) domain;
|
||||
in
|
||||
|
@ -53,6 +53,7 @@ in
|
|||
|
||||
services.hydra = {
|
||||
enable = true;
|
||||
package = inputs.self.packages.${pkgs.system}.hydra;
|
||||
hydraURL = "https://hydra.${domain}";
|
||||
inherit (config.links.hydra) port;
|
||||
notificationSender = "hydra@${domain}";
|
||||
|
|
|
@ -26,6 +26,7 @@ in
|
|||
};
|
||||
services.keycloak = {
|
||||
enable = true;
|
||||
package = inputs.self.packages.${pkgs.system}.keycloak;
|
||||
database = {
|
||||
createLocally = true;
|
||||
type = "postgresql";
|
||||
|
|
|
@ -1,18 +1,13 @@
|
|||
{ pkgs, lib, config, inputs, ... }:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(self: super: { flakePackages = inputs.self.packages.${pkgs.system}; })
|
||||
(self: super:
|
||||
(let
|
||||
patched = import ../../packages/patched-derivations.nix super;
|
||||
in {
|
||||
|
||||
hydra-unstable = patched.hydra;
|
||||
|
||||
inherit (patched) sssd tempo;
|
||||
|
||||
jre = patched.jre17_standard;
|
||||
|
||||
jre_headless = patched.jre17_standard;
|
||||
|
||||
})
|
||||
|
|
|
@ -29,6 +29,10 @@ super: rec {
|
|||
};
|
||||
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";
|
||||
|
||||
tempo = super.tempo.overrideAttrs (_: {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
packages = {
|
||||
keycloak = [ "x86_64-linux" ];
|
||||
uptime-kuma = [ "x86_64-linux" ];
|
||||
};
|
||||
checks = {
|
||||
|
|
Loading…
Reference in a new issue