From 34a147afe6b46d37fd80a7b86cf24c268482494b Mon Sep 17 00:00:00 2001 From: stuebinm Date: Sat, 17 Dec 2022 15:54:31 +0100 Subject: [PATCH] python 3.9 -> python 3.10 (nixos 22.11 changed the default version, so some of our stuff broke) --- pkgs/default.nix | 2 +- services/uffd.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 9d5ffa2..2ecf20e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -35,7 +35,7 @@ let # since overrides don't accumulate, this does both the override we want # and the one the netbox package would otherwise do, then disables overrides netbox = pkgs.netbox.override rec { - python3 = (pkgs.python39.override { + python3 = (pkgs.python3.override { packageOverrides = self: super: { django = super.django_4; social-auth-core = super.social-auth-core.overrideAttrs ( old: { diff --git a/services/uffd.nix b/services/uffd.nix index 9827d19..9a22947 100644 --- a/services/uffd.nix +++ b/services/uffd.nix @@ -49,7 +49,7 @@ in { env = [ "CONFIG_PATH=/persist/uffd/uffd.conf" ]; - hook-pre-app = "exec:FLASK_APP=${uffd}/lib/python3.9/site-packages/uffd flask db upgrade"; + hook-pre-app = "exec:FLASK_APP=${uffd}/lib/python3.10/site-packages/uffd flask db upgrade"; }; }; })).config.system.build.toplevel; @@ -59,7 +59,7 @@ in { forceSSL = true; locations = { "/".proxyPass = "http://${config.containers.uffd.localAddress}:8080"; - "/static".root = "${uffd}/lib/python3.9/site-packages/uffd"; + "/static".root = "${uffd}/lib/python3.10/site-packages/uffd"; "/static/hacc.png".return = "302 https://infra4future.de/assets/img/logo_vernetzung.png"; "/static/infra4future.svg".return = "302 https://infra4future.de/assets/img/infra4future.svg"; "/static/hedgedoc.svg".return = "302 https://infra4future.de/assets/img/icons/hedgedoc.svg";