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

Compare commits

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

No commits in common. "3d3b43ac2ec33dcfcfdba72ce26c75f0e75ddc5d" and "84a6b442bb813c5857161100075a512b561c2ba3" have entirely different histories.
3d3b43ac2e ... 84a6b442bb

4 changed files with 41 additions and 81 deletions
Show stats Expand all files Collapse all files

108
flake.lock generated
View file

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

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;
hash = "sha256-7YJjOChUC5HScNdU5XXp3gDparRCKtj1s2FQwyp6RPI="; hash = "sha256-DgXUBnyrx4b7YH/w7EJFAPT35MEKTBQBNHFteW+A7hE=";
}; };
sourceRoot = "source/integration/admin-client"; sourceRoot = "source/integration/admin-client";
mvnHash = "sha256-7TRNmQMo/KtM/XWF+KF7ALgr5J/7H6ejTtzsD2oIKZ0="; mvnHash = "sha256-lf2CSOM3uWcG3lw7CHz7KBUMS6Av1M9ak7jFEQX/f1I=";
# mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
installPhase = '' installPhase = ''

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

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

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

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