Compare commits

..

No commits in common. "513d5ad981eab75916c8a8789ec5e19ad66fd74d" and "4968d2cd3f690b3937bd17bbb2e8d1b9941469a7" have entirely different histories.

5 changed files with 8 additions and 11 deletions

View file

@ -433,7 +433,6 @@
};
systemPackages = with pkgs; [
appimage-run
incus
tailscale
];
};

View file

@ -71,7 +71,6 @@
openssh.enable = true;
cockpit = {
enable = true;
openFirewall = true;
settings = {
WebService = {
Origins = "https://cockpit.datarift.nl";

View file

@ -28,7 +28,7 @@ in
dates = "weekly";
};
defaultNetwork.settings.dns_enabled = true;
defaultNetwork.settings.dns_enable = true;
};

View file

@ -5,13 +5,13 @@ let
keywindTheme = pkgs.stdenv.mkDerivation {
pname = "keycloak-theme-keywind";
version = "unstable-2023-12-13";
version = "unstable-2023-10-22";
src = pkgs.fetchFromGitHub {
owner = "lukin";
repo = "keywind";
rev = "bdf966fdae0071ccd46dab4efdc38458a643b409";
hash = "sha256-8N+OQ6Yg9RKxqGd8kgsbvrYuVgol49bo/iJeIJXr3Sg=";
rev = "b1c47673ae091bc1a85a04434f2929ba5b8fa8bf";
hash = "sha256-Y88L7oW127Fex2D33A0tMnaJtSvM7hFZkzuVXZYoBhQ=";
};
doConfigure = false;

View file

@ -2,8 +2,7 @@
, fetchFromGitHub
}:
let
version = "23.0.3.1703879005";
jarVersion = "23.0.1";
version = "22.0.1";
in
stdenv.mkDerivation {
inherit version;
@ -12,14 +11,14 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "p2-inc";
repo = "phasetwo-containers";
rev = "v${version}";
hash = "sha256-s+RuihsX2zekFqhVHKQu+0xECoJHJH4K3JQd4CDbPo0=";
rev = "fac90ab2af4b82b59b8fdf6009606ddebe68a2f6";
hash = "sha256-IZQXIZOjm9DDf56Q8ayRvycs65P/eRP82FwGC8n7ZcY=";
};
doBuild = false;
doCheck = false;
installPhase = ''
install -D libs/ext/phasetwo-admin-ui-${jarVersion}.jar $out/phasetwo-admin-ui-${jarVersion}.jar
install -D libs/ext/phasetwo-admin-ui-${version}.jar $out/phasetwo-admin-ui-${version}.jar
'';
}