merge/resync-2025-09-08 #7

Merged
ahuston-0 merged 57 commits from merge/resync-2025-09-08 into add-gitea-pulls 2025-09-07 23:41:45 -04:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit f9d7629f95 - Show all commits

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
*~ *~
/.direnv/ /.direnv/
.test_info.* .test_info.*
/src/root/static/bootstrap
/src/sql/hydra-postgresql.sql /src/sql/hydra-postgresql.sql
/src/sql/hydra-sqlite.sql /src/sql/hydra-sqlite.sql
/src/sql/tmp.sqlite /src/sql/tmp.sqlite

View File

@@ -80,8 +80,9 @@ $ nix build
You can use the provided shell.nix to get a working development environment: You can use the provided shell.nix to get a working development environment:
``` ```
$ nix develop $ nix develop
$ mesonConfigurePhase $ ln -svf ../../../build/src/bootstrap src/root/static/bootstrap
$ ninja $ meson setup build
$ ninja -C build
``` ```
The development environment can also automatically be established using [nix-direnv](https://github.com/nix-community/nix-direnv). The development environment can also automatically be established using [nix-direnv](https://github.com/nix-community/nix-direnv).