erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:2a58f1da6858c7ae29e66f4e8dbc2756bb659f04
Branches Tags
erwin:main
..
compare: erwin:3d3b69452766fe4ebf33cc6dc02e782a7845a525
Branches Tags
erwin:main

No commits in common. "2a58f1da6858c7ae29e66f4e8dbc2756bb659f04" and "3d3b69452766fe4ebf33cc6dc02e782a7845a525" have entirely different histories.
2a58f1da68 ... 3d3b694527

4 changed files with 7 additions and 8 deletions
Show stats Expand all files Collapse all files

1
machines/default.nix
View file

@ -62,7 +62,6 @@ inputs: {
targetUser = "erwin"; targetUser = "erwin";
buildOn = "local"; buildOn = "local";
substituteOnTarget = true; substituteOnTarget = true;
tags = [ "container" ];
}; };
}; };
loki = { loki = {

4
modules/keycloak/keycloak-admin-ui.nix
View file

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak"; owner = "keycloak";
repo = "keycloak"; repo = "keycloak";
rev = version; rev = version;
sha256 = "FP3BtkimEy4eAEYsuQ/56zonE1FVjxEJVRENXGbGhnQ="; sha256 = "56JhP78pfWS21l9eTFoFTC+UX044nle79TAS21E0+80=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-pH4LNVq7+ERi/Hm5T3AOacamDZR5POQxMFOYLCXL0OM="; mvnHash = "sha256-Q9N/Ych7OFb25hifsfAoSTTBaZzd4WUcBhTsMpxJUkk=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

6
modules/keycloak/keycloak-orgs.nix
View file

@ -1,6 +1,6 @@
{ buildMavenPackage, fetchFromGitHub }: { buildMavenPackage, fetchFromGitHub }:
let let
version = "0.70"; version = "0.61";
in in
buildMavenPackage { buildMavenPackage {
inherit version; inherit version;
@ -10,13 +10,13 @@ buildMavenPackage {
owner = "p2-inc"; owner = "p2-inc";
repo = "keycloak-orgs"; repo = "keycloak-orgs";
rev = "v${version}"; rev = "v${version}";
sha256 = "VsPANkqKOTKlh2TJt7kzYoLr4T7v86g7HocmWxG/z7A="; sha256 = "a+CRMv0oq826s6KWjL8EM/iw4ZaqL00+RSzAYCqLwwY=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };
doCheck = false; doCheck = false;
mvnHash = "sha256-SXq4WxPgjJyO/DLvhptz5vOq3oOfmABygYFkl2C3HtI="; mvnHash = "sha256-NG3vA1+9gSVHqDqAg6wTCXD0wplvx0+ykUGLRe+MAug=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true";

4
modules/keycloak/phasetwo-admin-ui.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let let
version = "24.0.2.1712258262"; version = "24.0.0.1711026409";
jarVersion = "24.0.0"; jarVersion = "24.0.0";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "p2-inc"; owner = "p2-inc";
repo = "phasetwo-containers"; repo = "phasetwo-containers";
rev = "v${version}"; rev = "v${version}";
sha256 = "OwqbcZfhlSkm7ilK1+D+fGnnIfCsu4v76hFFPbWWsas="; sha256 = "gwD/wHd/zmDKtie7PfCvDJi+QjeQqDlgOj7DGV531go=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}; };