diff --git a/modules/autopatch/default.nix b/modules/autopatch/default.nix index d1e2c90..68da84b 100644 --- a/modules/autopatch/default.nix +++ b/modules/autopatch/default.nix @@ -7,7 +7,6 @@ inherit (patched) kanidm - powerdns-admin prometheus-jitsi-exporter tempo ; diff --git a/packages/patched-derivations.nix b/packages/patched-derivations.nix index cb0998b..5dbe850 100644 --- a/packages/patched-derivations.nix +++ b/packages/patched-derivations.nix @@ -44,14 +44,6 @@ super: rec { postgresql = super.postgresql_14; - powerdns-admin = let - package = super.powerdns-admin.override { - python3 = super.python3.override { - packageOverrides = _: _: { python3-saml = null; }; - }; - }; - in patch package "patches/base/powerdns-admin"; - prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter"; s3ql = (patch super.s3ql "patches/base/s3ql").overrideAttrs (old: { diff --git a/packages/system-filter.nix b/packages/system-filter.nix index 42659f1..d0d8a32 100644 --- a/packages/system-filter.nix +++ b/packages/system-filter.nix @@ -5,7 +5,6 @@ hydra = [ "x86_64-linux" ]; jellyfin = [ "x86_64-linux" ]; keycloak = [ "x86_64-linux" ]; - powerdns-admin = [ "x86_64-linux" ]; prometheus-jitsi-exporter = [ "aarch64-linux" ]; searxng = [ "x86_64-linux" ]; tempo = [ "x86_64-linux" ]; diff --git a/patches/base/powerdns-admin/fix-userinfo.patch b/patches/base/powerdns-admin/fix-userinfo.patch deleted file mode 100644 index 93785ea..0000000 --- a/patches/base/powerdns-admin/fix-userinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/powerdnsadmin/routes/index.py b/powerdnsadmin/routes/index.py -index 3a6f55c..417e05f 100644 ---- a/powerdnsadmin/routes/index.py -+++ b/powerdnsadmin/routes/index.py -@@ -392,7 +392,7 @@ def login(): - return authenticate_user(user, 'Azure OAuth') - - if 'oidc_token' in session: -- user_data = json.loads(oidc.get('userinfo').text) -+ user_data = oidc.userinfo() - oidc_username = user_data[Setting().get('oidc_oauth_username')] - oidc_first_name = user_data[Setting().get('oidc_oauth_firstname')] - oidc_last_name = user_data[Setting().get('oidc_oauth_last_name')]