4 files changed, 20 insertions, 5 deletions

diff --git a/overlays/postfix-mta-sts-resolver/default.nix b/overlays/postfix-mta-sts-resolver/default.nix
index 49fbb7c9..d930cefb 100644
--- a/overlays/postfix-mta-sts-resolver/default.nix
+++ b/overlays/postfix-mta-sts-resolver/default.nix
@@ -3,6 +3,7 @@
   postfix-mta-sts-resolver =
     with prev.poetry2nix;
     mkPoetryApplication {
+      python = prev.python311;
       inherit (sources.postfix-mta-sts-resolver) pname version;
       projectDir = cleanPythonSources {
         src = prev.runCommand "sources" {} ''
diff --git a/overlays/preserve-dscp/default.nix b/overlays/preserve-dscp/default.nix
index 73721083..a1064591 100644
--- a/overlays/preserve-dscp/default.nix
+++ b/overlays/preserve-dscp/default.nix
@@ -10,7 +10,8 @@
     buildFlags = [ "preserve-dscp" ];
 
     CPATH = prev.lib.makeSearchPathOutput "dev" "include" (buildInputs ++ nativeBuildInputs);
-    BPF_CFLAGS = "-Wno-unused-command-line-argument -fno-stack-protector";
+    BPF_CFLAGS = "-Wno-unused-command-line-argument";
+    hardeningDisable = [ "stackprotector" "zerocallusedregs" ];
 
     outputs = [ "out" "lib" ];
 
diff --git a/overlays/radicale.nix b/overlays/radicale.nix
new file mode 100644
index 00000000..a4179295
--- /dev/null
+++ b/overlays/radicale.nix
@@ -0,0 +1,13 @@
+{ prev, ... }:
+let
+  nixpkgs = prev.fetchFromGitHub {
+    owner = "NixOS";
+    repo = "nixpkgs";
+    rev = "5fa4d405272ea98dab145f0c9f7ea1dbb9c87c31";
+    hash = "sha256-Qwwbt4vbqwllUJElZomSybbZkbmhsuIac3gqrl+GVUs=";
+  };
+  pkgs = (import (nixpkgs + "/pkgs/top-level")) { localSystem = prev.stdenv.buildPlatform.system; };
+in rec {
+  radicale3 = radicale;
+  inherit (pkgs) radicale;
+}
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index 821d2cdd..21316182 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -42,7 +42,7 @@ class TogglAPISection(Enum):
     REPORTS = '/reports/api/v2'
 
 class TogglAPIError(Exception):
-    def __init__(self, http_error, response):
+    def __init__(self, response, *, http_error=None):
         self.http_error = http_error
         self.response = response
 
@@ -179,15 +179,15 @@ class TogglAPI(object):
         url = self._make_url(api = TogglAPISection.TOGGL, section = ['me', 'time_entries', 'current'])
         r = self._query(url = url, method='GET')
 
-        if not r:
-            raise TogglAPIError(None, r)
+        if not r or (not r.json() and r.json() is not None):
+            raise TogglAPIError(r)
 
         if not r.json() or not r.json()['billable']:
             return None
 
         if self._client_ids is not None:
             if 'pid' in r.json() and r.json()['pid']:
-                url = self._make_url(api = TogglAPISection.TOGGL, section = ['workspaces', self._workspace_id, 'projects', str(r.json()['pid'])])
+                url = self._make_url(api = TogglAPISection.TOGGL, section = ['projects', str(r.json()['pid'])])
                 pr = self._query(url = url, method = 'GET')
                 if not pr or not pr.json():
                     raise TogglAPIError(pr)