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

Compare commits

base: erwin:3428449501492848bca95e9f7d0e223d2802d66d
Branches Tags
erwin:main
...
compare: erwin:1f6a08ed9b8c026d211a3a55d58cbfa77cf4c9d8
Branches Tags
erwin:main

2 commits
3428449501 ... 1f6a08ed9b

Author SHA1 Message Date
Erwin Boskma
1f6a08ed9b
keycloak: Update admin-ui and orgs 2024-01-23 12:04:28 +01:00
Erwin Boskma
b1f27d6252
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/83731bc2f68f485e843534da607f374f75b4f0bd' (2024-01-22)
  → 'github:nix-community/emacs-overlay/e2953343aa80377bb1f486f46ef5553b5570753e' (2024-01-23)
• Updated input 'home-manager':
    'github:nix-community/home-manager/2d47379ad591bcb14ca95a90b6964b8305f6c913' (2024-01-21)
  → 'github:nix-community/home-manager/3df2a80f3f85f91ea06e5e91071fa74ba92e5084' (2024-01-23)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/e36f66bb10b09f5189dc3b1706948eaeb9a1c555' (2024-01-22)
  → 'github:oxalica/rust-overlay/f889dc31ef97835834bdc3662394ebdb3c96b974' (2024-01-23)
 2024-01-23 11:37:12 +01:00
3 changed files with 20 additions and 15 deletions
Show stats Expand all files Collapse all files

18
flake.lock
View file

@ -148,11 +148,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1705913685,
"narHash": "sha256-Npj1tB5lkYTAAQ0QAQMm505sluFJaX9ZBCM0SksZZ/Q=",
"lastModified": 1706000038,
"narHash": "sha256-QytIgkH0wEV2SlW0qttfINEyXPuD7o22W6ZzUceT6z4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "83731bc2f68f485e843534da607f374f75b4f0bd",
"rev": "e2953343aa80377bb1f486f46ef5553b5570753e",
"type": "github"
},
"original": {
@ -414,11 +414,11 @@
]
},
"locked": {
"lastModified": 1705879479,
"narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=",
"lastModified": 1706001011,
"narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913",
"rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
"type": "github"
},
"original": {
@ -762,11 +762,11 @@
]
},
"locked": {
"lastModified": 1705889935,
"narHash": "sha256-77KPBK5e0ACNzIgJDMuptTtEqKvHBxTO3ksqXHHVO+4=",
"lastModified": 1705976279,
"narHash": "sha256-Zx97bJ3+O8IP70uJPD//rRsr8bcxICISMTZUT/L9eFk=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "e36f66bb10b09f5189dc3b1706948eaeb9a1c555",
"rev": "f889dc31ef97835834bdc3662394ebdb3c96b974",
"type": "github"
},
"original": {

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

@ -13,12 +13,13 @@ buildMavenPackage {
owner = "keycloak";
repo = "keycloak";
rev = version;
hash = "sha256-2tTdm8e+OUgO+g/ob1mw+4wFbr6wAPlnbCr8edKGuoE=";
hash = "sha256-SmK8xko+py5RnbwhCzDzpEDqUs52jdaVVNY7w1TXmRU=";
};
sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-dM9KBAjRPtea3kgmkEQiS953U/jAAXOfgpJOE/KuCOE=";
mvnHash = "sha256-18V+g3LRndcQGhpyq3wWKM/u8lJQRd1064tatUZhGys=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = ''
install -D target/keycloak-admin-client-${version}.jar $out/keycloak-admin-client-${version}.jar

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

@ -2,7 +2,7 @@
, fetchFromGitHub
}:
let
version = "0.43";
version = "0.49";
in
buildMavenPackage {
inherit version;
@ -12,12 +12,16 @@ buildMavenPackage {
owner = "p2-inc";
repo = "keycloak-orgs";
rev = "v${version}";
hash = "sha256-aOnhUdDc9GNkBJx+bG393VDgFvB+ZKVzGBP8MBbqOhU=";
hash = "sha256-VkXyaQdAz/UsE+qTydRy4BMAxfo3pL2FbFIdmuhTehs=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};
mvnHash = "sha256-gOqXkyumC4/5S+Sb7/Ed7b93sR3kq660I0x4MFxFwro=";
doCheck = false;
mvnParameters = "-Dmaven.buildNumber.skip=true";
mvnHash = "sha256-U+llOMa//Foybtv1j1ClHDGOTQndc2rPkoIuH4huf+I=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true";
installPhase = ''
install -D target/keycloak-orgs-${version}.jar $out/keycloak-orgs-${version}.jar