From e2c7808433b60e355dea06af1655dca7628a5b52 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 23 Mar 2025 19:07:59 +0100
Subject: [PATCH 1/4] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'disko':
'github:nix-community/disko/19c1140419c4f1cdf88ad4c1cfb6605597628940' (2025-02-25)
→ 'github:nix-community/disko/0d8c6ad4a43906d14abd5c60e0ffe7b587b213de' (2025-03-12)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/3876f6b87db82f33775b1ef5ea343986105db764' (2025-03-01)
→ 'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9' (2025-03-07)
• Updated input 'flake-parts/nixpkgs-lib':
'https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz?narHash=sha256-3wHafybyRfpUCLoE8M%2BuPVZinImg3xX%2BNm6gEfN3G8I%3D' (2025-03-01)
→ 'github:nix-community/nixpkgs.lib/147dee35aab2193b174e4c0868bd80ead5ce755c' (2025-03-02)
• Updated input 'fork':
'github:teutat3s/nixpkgs/e370f40b129e47b08562524ab4f053a172a94273' (2025-02-06)
→ 'github:teutat3s/nixpkgs/8a43eb74ac149c080d57d8c80d647fef74df84d8' (2025-03-05)
• Updated input 'home-manager':
'github:nix-community/home-manager/9d3d080aec2a35e05a15cedd281c2384767c2cfe' (2025-02-17)
→ 'github:nix-community/home-manager/0948aeedc296f964140d9429223c7e4a0702a1ff' (2025-03-22)
• Updated input 'nix-darwin':
'github:lnl7/nix-darwin/991bb2f6d46fc2ff7990913c173afdb0318314cb' (2025-03-04)
→ 'github:lnl7/nix-darwin/ebb88c3428dcdd95c06dca4d49b9791a65ab777b' (2025-03-23)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/1546c45c538633ae40b93e2d14e0bb6fd8f13347' (2025-03-02)
→ 'github:nixos/nixpkgs/f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092' (2025-03-23)
• Updated input 'unstable':
'github:nixos/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246' (2025-03-03)
→ 'github:nixos/nixpkgs/1e5b653dff12029333a6546c11e108ede13052eb' (2025-03-22)
---
flake.lock | 57 ++++++++++++++++++++++++++++--------------------------
1 file changed, 30 insertions(+), 27 deletions(-)
diff --git a/flake.lock b/flake.lock
index 4e3dd0b9..2b375fcc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,11 +94,11 @@
]
},
"locked": {
- "lastModified": 1740485968,
- "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+ "lastModified": 1741786315,
+ "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
"owner": "nix-community",
"repo": "disko",
- "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+ "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
"type": "github"
},
"original": {
@@ -185,11 +185,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1740872218,
- "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
+ "lastModified": 1741352980,
+ "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
+ "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@@ -236,11 +236,11 @@
},
"fork": {
"locked": {
- "lastModified": 1738846146,
- "narHash": "sha256-cIPiBEspPXQxju2AUZK9kjh6oqea+HkPFqmGv7yUztM=",
+ "lastModified": 1741180627,
+ "narHash": "sha256-NM2X42gtXuYT7EG+zYcvNTZ/6+CTc3fSiIwdcQcp0dk=",
"owner": "teutat3s",
"repo": "nixpkgs",
- "rev": "e370f40b129e47b08562524ab4f053a172a94273",
+ "rev": "8a43eb74ac149c080d57d8c80d647fef74df84d8",
"type": "github"
},
"original": {
@@ -257,11 +257,11 @@
]
},
"locked": {
- "lastModified": 1739757849,
- "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+ "lastModified": 1742655702,
+ "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+ "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
"type": "github"
},
"original": {
@@ -320,11 +320,11 @@
]
},
"locked": {
- "lastModified": 1741112248,
- "narHash": "sha256-Y340xoE1Vgo0eCDJi4srVjuwlr50vYSoyJrZeXHw3n0=",
+ "lastModified": 1742741935,
+ "narHash": "sha256-ZCNvPYWkL9hxzgWn1gmYCZItqBU4ujsWjwWNpcwCjfQ=",
"owner": "lnl7",
"repo": "nix-darwin",
- "rev": "991bb2f6d46fc2ff7990913c173afdb0318314cb",
+ "rev": "ebb88c3428dcdd95c06dca4d49b9791a65ab777b",
"type": "github"
},
"original": {
@@ -336,11 +336,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1740932899,
- "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
+ "lastModified": 1742751704,
+ "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
+ "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
"type": "github"
},
"original": {
@@ -352,14 +352,17 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1740872140,
- "narHash": "sha256-3wHafybyRfpUCLoE8M+uPVZinImg3xX+Nm6gEfN3G8I=",
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz"
+ "lastModified": 1740877520,
+ "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
+ "type": "github"
},
"original": {
- "type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/6d3702243441165a03f699f64416f635220f4f15.tar.gz"
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
}
},
"root": {
@@ -468,11 +471,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1741010256,
- "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
+ "lastModified": 1742669843,
+ "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
+ "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
"type": "github"
},
"original": {
From f591ea6c65a44c5af31a3a406edf66ecb0adc14c Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 11 Mar 2025 22:54:00 +0100
Subject: [PATCH 2/4] overlays: remove matrix-authentication-service
It's now backported to NixOS 24.11.
---
overlays/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/overlays/default.nix b/overlays/default.nix
index f9c3039d..d07f2095 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,7 +12,6 @@
unstable = import inputs.unstable { system = prev.system; };
in
{
- matrix-authentication-service = unstable.matrix-authentication-service;
element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; };
element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker {
inherit (inputs) element-stickers maunium-stickerpicker;
From b5e6483ca4e1ca6f0bb2ac61d8b161b4e2de78ba Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 25 Mar 2025 18:39:04 +0100
Subject: [PATCH 3/4] garage: update to 1.1.0
---
modules/garage/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/garage/default.nix b/modules/garage/default.nix
index 68b9bcaf..57dceee6 100644
--- a/modules/garage/default.nix
+++ b/modules/garage/default.nix
@@ -88,7 +88,7 @@
services.garage = {
enable = true;
- package = pkgs.garage_1_0_1;
+ package = pkgs.garage_1_1_0;
settings = {
data_dir = "/var/lib/garage/data";
metadata_dir = "/var/lib/garage/meta";
From 3cf98c1e0e266b689e52102b579a1be00448539a Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 25 Mar 2025 18:39:26 +0100
Subject: [PATCH 4/4] tests/keycloak: need to start acme-server
---
tests/keycloak.nix | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/keycloak.nix b/tests/keycloak.nix
index 5224b99d..2ab4ecee 100644
--- a/tests/keycloak.nix
+++ b/tests/keycloak.nix
@@ -76,8 +76,15 @@ in
wmClass = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
in
''
- nachtigall.start()
+ acme_server.start()
+ acme_server.wait_for_unit("default.target")
+ acme_server.wait_for_unit("step-ca.service")
+ acme_server.succeed("ping ca.test.pub.solar -c 2")
+ acme_server.wait_for_open_port(443)
+ acme_server.wait_until_succeeds("curl 127.0.0.1:443")
+
+ nachtigall.start()
nachtigall.wait_for_unit("default.target")
nachtigall.succeed("ping 127.0.0.1 -c 2")
nachtigall.wait_for_unit("nginx.service")