kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

expose git to button, fixes error executing 'git': No such file or directory

Browse source
This commit is contained in:
Kiara Grouwstra 2025-03-21 19:03:30 +01:00
parent d0b25bf8b7
commit f37d113dff
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
panel/env.nix
View file

@ -9,5 +9,10 @@ in
{ {
REPO_DIR = toString ../.; REPO_DIR = toString ../.;
# explicitly use nix, as e.g. lix does not have configurable-impure-env # explicitly use nix, as e.g. lix does not have configurable-impure-env
NIX_BIN = lib.getExe pkgs.nix; BIN_PATH = lib.makeBinPath [
# explicitly use nix, as e.g. lix does not have configurable-impure-env
pkgs.nix
# nixops error maybe due to our flake git hook: executing 'git': No such file or directory
pkgs.git
];
} }

4
panel/src/panel/settings.py
View file

@ -192,8 +192,8 @@ if user_settings_file is not None:
# The correct thing to do here would be using a helper function such as with `get_secret()` that will catch the exception and explain what's wrong and where to put the right values. # The correct thing to do here would be using a helper function such as with `get_secret()` that will catch the exception and explain what's wrong and where to put the right values.
# Replacing the `USER_SETTINGS_FILE` mechanism following the comment there would probably be a good thing. # Replacing the `USER_SETTINGS_FILE` mechanism following the comment there would probably be a good thing.
# a dir of nix supporting experimental feature `configurable-impure-env`. # PATH to expose to launch button
nix_bin=env['NIX_BIN'] bin_path=env['BIN_PATH']
# path of the root flake to trigger nixops from, see #94. # path of the root flake to trigger nixops from, see #94.
# to deploy this should be specified, for dev just use a relative path. # to deploy this should be specified, for dev just use a relative path.
repo_dir = env["REPO_DIR"] repo_dir = env["REPO_DIR"]

3
panel/src/panel/views.py
View file

@ -58,11 +58,12 @@ class ConfigurationForm(LoginRequiredMixin, FormView):
# serialize back and forth now we still need to manually inject the dummy user # serialize back and forth now we still need to manually inject the dummy user
deployment = json.dumps(dummy_user | json.loads(submission)) deployment = json.dumps(dummy_user | json.loads(submission))
env = { env = {
"PATH": settings.bin_path,
# pass in form info to our deployment # pass in form info to our deployment
"DEPLOYMENT": deployment, "DEPLOYMENT": deployment,
} }
cmd = [ cmd = [
settings.nix_bin, "nix",
"develop", "develop",
# workaround to pass in info to nixops4 thru env vars, tho impure :( # workaround to pass in info to nixops4 thru env vars, tho impure :(
"--extra-experimental-features", "--extra-experimental-features",