From 65664b2f20f0298d7d7ce5fccf9f6188ef0882c0 Mon Sep 17 00:00:00 2001
From: yuri <yuri@nekover.se>
Date: Sun, 26 May 2024 16:03:05 +0200
Subject: [PATCH] Get keycloak 23.0.7 from master

---
 config/hosts/keycloak/keycloak.nix |  3 ++-
 flake.lock                         | 17 +++++++++++++++++
 flake.nix                          |  7 ++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/config/hosts/keycloak/keycloak.nix b/config/hosts/keycloak/keycloak.nix
index 79e9a96..0937e24 100644
--- a/config/hosts/keycloak/keycloak.nix
+++ b/config/hosts/keycloak/keycloak.nix
@@ -1,7 +1,8 @@
-{ ... }:
+{ nixpkgs-master-keycloak-23_0_7, ... }:
 {
   services.keycloak = {
     enable = true;
+    package = nixpkgs-master-keycloak-23_0_7.legacyPackages."x86_64-linux".keycloak;
     settings = {
       hostname = "id.nekover.se";
       hostname-admin = "keycloak-admin.nekover.se";
diff --git a/flake.lock b/flake.lock
index 52edb0e..0535751 100644
--- a/flake.lock
+++ b/flake.lock
@@ -146,6 +146,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-master-keycloak-23_0_7": {
+      "locked": {
+        "lastModified": 1708610845,
+        "narHash": "sha256-2ta+qGOkQJOeDx00bzxmjP0XO38xkJjZDDA+hq/04SM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edc6a7a312c4f914f9bded421efa6f0b1b715693",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edc6a7a312c4f914f9bded421efa6f0b1b715693",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1716704148,
@@ -183,6 +199,7 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-23-05": "nixpkgs-23-05",
         "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs-master-keycloak-23_0_7": "nixpkgs-master-keycloak-23_0_7",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
diff --git a/flake.nix b/flake.nix
index c789cbb..9abb06c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
+    nixpkgs-master-keycloak-23_0_7.url = "github:NixOS/nixpkgs/edc6a7a312c4f914f9bded421efa6f0b1b715693";
     nixpkgs-23-05.url = "github:NixOS/nixpkgs/nixos-23.05-small";
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
@@ -11,7 +12,7 @@
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixpkgs-23-05, nixos-generators, simple-nixos-mailserver, ... }@inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-master, nixpkgs-master-keycloak-23_0_7, nixpkgs-23-05, nixos-generators, simple-nixos-mailserver, ... }@inputs:
   let
     hosts = import ./hosts.nix inputs;
     helper = import ./helper.nix inputs;
@@ -29,7 +30,7 @@
         nodeNixpkgs = builtins.mapAttrs (name: host: host.pkgs) hosts;
 
         specialArgs = {
-          inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver;
+          inherit nixpkgs-unstable nixpkgs-master nixpkgs-master-keycloak-23_0_7 hosts simple-nixos-mailserver;
 
           # Provide environment for secret key command
           keyCommandEnv = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" ];
@@ -39,7 +40,7 @@
 
     hydraJobs = {
       nixConfigurations = builtins.mapAttrs (host: helper.generateNixConfiguration host {
-        inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver;
+        inherit nixpkgs-unstable nixpkgs-master nixpkgs-master-keycloak-23_0_7 hosts simple-nixos-mailserver;
       }) hosts;
     };