hacc/haccfiles
8
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

python 3.9 -> python 3.10

Browse source 
(nixos 22.11 changed the default version, so some of our stuff broke)
This commit is contained in:
stuebinm 2022-12-17 15:54:31 +01:00
parent 1720b7bf81
commit 34a147afe6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/default.nix
View file

@ -35,7 +35,7 @@ let
# since overrides don't accumulate, this does both the override we want # since overrides don't accumulate, this does both the override we want
# and the one the netbox package would otherwise do, then disables overrides # and the one the netbox package would otherwise do, then disables overrides
netbox = pkgs.netbox.override rec { netbox = pkgs.netbox.override rec {
python3 = (pkgs.python39.override { python3 = (pkgs.python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
django = super.django_4; django = super.django_4;
social-auth-core = super.social-auth-core.overrideAttrs ( old: { social-auth-core = super.social-auth-core.overrideAttrs ( old: {

4
services/uffd.nix
View file

@ -49,7 +49,7 @@ in {
env = [ env = [
"CONFIG_PATH=/persist/uffd/uffd.conf" "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; })).config.system.build.toplevel;
@ -59,7 +59,7 @@ in {
forceSSL = true; forceSSL = true;
locations = { locations = {
"/".proxyPass = "http://${config.containers.uffd.localAddress}:8080"; "/".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/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/infra4future.svg".return = "302 https://infra4future.de/assets/img/infra4future.svg";
"/static/hedgedoc.svg".return = "302 https://infra4future.de/assets/img/icons/hedgedoc.svg"; "/static/hedgedoc.svg".return = "302 https://infra4future.de/assets/img/icons/hedgedoc.svg";