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

Compare commits

base: erwin:84a6b442bb813c5857161100075a512b561c2ba3
Branches Tags
erwin:main
...
compare: erwin:3d3b43ac2ec33dcfcfdba72ce26c75f0e75ddc5d
Branches Tags
erwin:main

2 commits
84a6b442bb ... 3d3b43ac2e

Author SHA1 Message Date
Erwin Boskma
3d3b43ac2e
keycloak: Update plugins 2024-07-25 10:39:02 +02:00
Erwin Boskma
f39fc76dd4
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/95cef714902bbcbdc3ef016457e7a77d38293ea8?narHash=sha256-X8bsyPCTIWZsxzXTOHbfOkQGhQlPyLQBvdOjJALu4s0%3D' (2024-07-22)
  → 'github:atuinsh/atuin/3cf52990e4a8d0e854f5a0ed8f04ffa782b92f17?narHash=sha256-lrmxE8AzY3%2BI%2BlnkLiFjGV1A4P/F2zhTlJsiOx1dsHw%3D' (2024-07-23)
• Updated input 'disko':
    'github:nix-community/disko/2f5df5dcceb8473dd5715c4ae92f9b0d5f87fff9?narHash=sha256-1F2N90WqHV14oIn5RpDfzINj4zMi5gBQOt1BAc34gGM%3D' (2024-07-22)
  → 'github:nix-community/disko/55e874b9c14764cb791e5740f0e92202e41393fc?narHash=sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0%3D' (2024-07-25)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/b3c3f03e594177220148b3e2f9aef9228cc04321?narHash=sha256-r4O1YRu23CudbakeyrH0R0skMabU9hbqklSR0a0XvWc%3D' (2024-07-23)
  → 'github:nix-community/emacs-overlay/6ad922f8168b6b6aa8c5894dbbcc82840758aea5?narHash=sha256-GXx%2BviSegNL3HH2oUVh5DJE/JhK38GCJjKmTIj4aF0c%3D' (2024-07-25)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/63d37ccd2d178d54e7fb691d7ec76000740ea24a?narHash=sha256-7cCC8%2BTdq1%2B3OPyc3%2BgVo9dzUNkNIQfwSDJ2HSi2u3o%3D' (2024-07-21)
  → 'github:NixOS/nixpkgs/575f3027caa1e291d24f1e9fb0e3a19c2f26d96b?narHash=sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0%3D' (2024-07-22)
• Updated input 'home-manager':
    'github:nix-community/home-manager/7560dc942a6fbd37ebd1310b3dbda513de2d4b82?narHash=sha256-ZDW5%2BrlROxaOuoEfIQM7Gqhoa%2BWALEYdYIiZhyJjAu0%3D' (2024-07-23)
  → 'github:nix-community/home-manager/304a011325b7ac7b8c9950333cd215a7aa146b0e?narHash=sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o%3D' (2024-07-24)
• Updated input 'microvm':
    'github:astro/microvm.nix/a50d1bf0d4a2f23ce2ffc503d65c9423a8a268e1?narHash=sha256-KuFuVK1Jccku8Vsy8C%2Bjtw1ixUwCdIH0jafjt5zDZao%3D' (2024-07-22)
  → 'github:astro/microvm.nix/2f56d58cae49d6b66adc42aa3c52051a83f6a176?narHash=sha256-%2BcKh/zzyzOfOC7GryAVMESpvTckOVJ%2BcQC01JJi1z8k%3D' (2024-07-24)
• Added input 'microvm/fenix':
    'github:nix-community/fenix/abc0549e3560189462a7d394cc9d50af4608d103?narHash=sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU%3D' (2024-07-08)
• Added input 'microvm/fenix/nixpkgs':
    follows 'microvm/nixpkgs'
• Added input 'microvm/fenix/rust-analyzer-src':
    'github:rust-lang/rust-analyzer/a5b21ea0aa644dffd7cf958b43f11f221d53404e?narHash=sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk%3D' (2024-07-07)
• Updated input 'microvm/spectrum':
    'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=6d0e73864d28794cdbd26ab7b37259ab0e1e044c' (2024-02-19)
  → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=fb59d42542049f586c84b0f8bb86ff3be338e9d3' (2024-07-06)
• Updated input 'naersk':
    'github:nix-community/naersk/941ce6dc38762a7cfb90b5add223d584feed299b?narHash=sha256-uFsCwWYI2pUpt0awahSBorDUrUfBhaAiyz%2BBPTS2MHk%3D' (2024-06-18)
  → 'github:nix-community/naersk/3fb418eaf352498f6b6c30592e3beb63df42ef11?narHash=sha256-r/xppY958gmZ4oTfLiHN0ZGuQ%2BRSTijDblVgVLFi1mw%3D' (2024-07-23)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/ab165a8a6cd12781d76fe9cbccb9e975d0fb634f?narHash=sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4%3D' (2024-07-19)
  → 'github:NixOS/nixos-hardware/a7432ebaefc9a400dcda399d48b949230378d784?narHash=sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo%3D' (2024-07-24)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/4674ff2c2e5423a0cebe16e61aa874c359306af4?narHash=sha256-nM4szL90VeZHZEC5rFfaiiPNTVOmsihdtk2QSP1l37I%3D' (2024-07-23)
  → 'github:oxalica/rust-overlay/33a7853f54f1797b029739297c4593bd96077c20?narHash=sha256-HyFmp6rktJQMxG%2BBZEjcQoCFKMek855Cc/dQk2YDac0%3D' (2024-07-25)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/888bfb10a9b091d9ed2f5f8064de8d488f7b7c97?narHash=sha256-wNXLQ/ATs1S4Opg1PmuNoJ%2BWamqj93rgZYV3Di7kxkg%3D' (2024-07-20)
  → 'github:numtide/treefmt-nix/8db8970be1fb8be9c845af7ebec53b699fe7e009?narHash=sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ%2B3ihtunJ014%3D' (2024-07-23)
 2024-07-25 08:39:21 +02:00
4 changed files with 81 additions and 41 deletions
Show stats Expand all files Collapse all files

108
flake.lock
View file

@ -56,11 +56,11 @@
]
},
"locked": {
"lastModified": 1721662272,
"narHash": "sha256-X8bsyPCTIWZsxzXTOHbfOkQGhQlPyLQBvdOjJALu4s0=",
"lastModified": 1721738321,
"narHash": "sha256-lrmxE8AzY3+I+lnkLiFjGV1A4P/F2zhTlJsiOx1dsHw=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "95cef714902bbcbdc3ef016457e7a77d38293ea8",
"rev": "3cf52990e4a8d0e854f5a0ed8f04ffa782b92f17",
"type": "github"
},
"original": {
@ -197,11 +197,11 @@
]
},
"locked": {
"lastModified": 1721612107,
"narHash": "sha256-1F2N90WqHV14oIn5RpDfzINj4zMi5gBQOt1BAc34gGM=",
"lastModified": 1721871128,
"narHash": "sha256-NyWVCnSeePnJHGJxZ0l3zdGQGrVjUcx2IJbV8KIsPf0=",
"owner": "nix-community",
"repo": "disko",
"rev": "2f5df5dcceb8473dd5715c4ae92f9b0d5f87fff9",
"rev": "55e874b9c14764cb791e5740f0e92202e41393fc",
"type": "github"
},
"original": {
@ -221,11 +221,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1721698997,
"narHash": "sha256-r4O1YRu23CudbakeyrH0R0skMabU9hbqklSR0a0XvWc=",
"lastModified": 1721872697,
"narHash": "sha256-GXx+viSegNL3HH2oUVh5DJE/JhK38GCJjKmTIj4aF0c=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "b3c3f03e594177220148b3e2f9aef9228cc04321",
"rev": "6ad922f8168b6b6aa8c5894dbbcc82840758aea5",
"type": "github"
},
"original": {
@ -280,6 +280,28 @@
"type": "github"
}
},
"fenix_2": {
"inputs": {
"nixpkgs": [
"microvm",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src_2"
},
"locked": {
"lastModified": 1720420198,
"narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=",
"owner": "nix-community",
"repo": "fenix",
"rev": "abc0549e3560189462a7d394cc9d50af4608d103",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -587,11 +609,11 @@
]
},
"locked": {
"lastModified": 1721714663,
"narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=",
"lastModified": 1721852138,
"narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82",
"rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
"type": "github"
},
"original": {
@ -602,6 +624,7 @@
},
"microvm": {
"inputs": {
"fenix": "fenix_2",
"flake-utils": [
"flake-utils"
],
@ -611,11 +634,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1721690868,
"narHash": "sha256-KuFuVK1Jccku8Vsy8C+jtw1ixUwCdIH0jafjt5zDZao=",
"lastModified": 1721849618,
"narHash": "sha256-+cKh/zzyzOfOC7GryAVMESpvTckOVJ+cQC01JJi1z8k=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "a50d1bf0d4a2f23ce2ffc503d65c9423a8a268e1",
"rev": "2f56d58cae49d6b66adc42aa3c52051a83f6a176",
"type": "github"
},
"original": {
@ -631,11 +654,11 @@
]
},
"locked": {
"lastModified": 1718727675,
"narHash": "sha256-uFsCwWYI2pUpt0awahSBorDUrUfBhaAiyz+BPTS2MHk=",
"lastModified": 1721727458,
"narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
"owner": "nix-community",
"repo": "naersk",
"rev": "941ce6dc38762a7cfb90b5add223d584feed299b",
"rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
"type": "github"
},
"original": {
@ -694,11 +717,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1721413321,
"narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
"lastModified": 1721839713,
"narHash": "sha256-apTv16L9h5ONS2VTPbKEgwAOVmWGku0MsfprjgwBFHo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
"rev": "a7432ebaefc9a400dcda399d48b949230378d784",
"type": "github"
},
"original": {
@ -753,11 +776,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1721548954,
"narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
"lastModified": 1721686456,
"narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
"rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b",
"type": "github"
},
"original": {
@ -911,6 +934,23 @@
"type": "github"
}
},
"rust-analyzer-src_2": {
"flake": false,
"locked": {
"lastModified": 1720344064,
"narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
@ -943,11 +983,11 @@
]
},
"locked": {
"lastModified": 1721701191,
"narHash": "sha256-nM4szL90VeZHZEC5rFfaiiPNTVOmsihdtk2QSP1l37I=",
"lastModified": 1721873995,
"narHash": "sha256-HyFmp6rktJQMxG+BZEjcQoCFKMek855Cc/dQk2YDac0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4674ff2c2e5423a0cebe16e61aa874c359306af4",
"rev": "33a7853f54f1797b029739297c4593bd96077c20",
"type": "github"
},
"original": {
@ -980,11 +1020,11 @@
"spectrum": {
"flake": false,
"locked": {
"lastModified": 1708358594,
"narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=",
"lastModified": 1720264467,
"narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=",
"ref": "refs/heads/main",
"rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c",
"revCount": 614,
"rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3",
"revCount": 674,
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
},
@ -1061,11 +1101,11 @@
]
},
"locked": {
"lastModified": 1721458737,
"narHash": "sha256-wNXLQ/ATs1S4Opg1PmuNoJ+Wamqj93rgZYV3Di7kxkg=",
"lastModified": 1721769617,
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "888bfb10a9b091d9ed2f5f8064de8d488f7b7c97",
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
"type": "github"
},
"original": {

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

@ -14,12 +14,12 @@ buildMavenPackage {
owner = "keycloak";
repo = "keycloak";
rev = version;
hash = "sha256-DgXUBnyrx4b7YH/w7EJFAPT35MEKTBQBNHFteW+A7hE=";
hash = "sha256-7YJjOChUC5HScNdU5XXp3gDparRCKtj1s2FQwyp6RPI=";
};
sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-lf2CSOM3uWcG3lw7CHz7KBUMS6Av1M9ak7jFEQX/f1I=";
mvnHash = "sha256-7TRNmQMo/KtM/XWF+KF7ALgr5J/7H6ejTtzsD2oIKZ0=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = ''

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

@ -1,6 +1,6 @@
{ buildMavenPackage, fetchFromGitHub }:
let
version = "0.76";
version = "0.77";
in
buildMavenPackage {
inherit version;
@ -10,7 +10,7 @@ buildMavenPackage {
owner = "p2-inc";
repo = "keycloak-orgs";
rev = "v${version}";
hash = "sha256-izrZ1ke9BuVZAuWdoJTqNEXsEyw5skuWXiGfUFq2l4k=";
hash = "sha256-Gz/Hspd8EHGzWIKOp+DRZ8TACfdPuIx0NjJqC6adEaA=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};

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

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let
version = "25.0.1.1718907377";
jarVersion = "25.0.0";
version = "25.0.2.1721752809";
jarVersion = "25.0.2";
in
stdenv.mkDerivation {
inherit version;
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "p2-inc";
repo = "phasetwo-containers";
rev = "v${version}";
hash = "sha256-Xk/4Nq2u5reZeMoNHWGS8sZXiGtd/BFRB6dA9AW0fKw=";
hash = "sha256-U2gO5i3Uwy8ggHmyTkdrPnVzJHhLCB5voZqCh0JIJps=";
# hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};