fediversity/fediversity

Watch

Fork 10

WIP: destructure pkgs argument in package modules #395

Closed

kiara wants to merge 1 commit from kiara/fediversity:destructure-packages into main

kiara commented

2025-06-19 11:09:12 +02:00

Owner

so far we weren't using
imposes some extra burden on the importer
seems aimed at package modules, which i'm not sure helps for the likes of e.g. NixOS modules

restructures some initial package-structured modules, as a start to #93. i mostly tried this for the learning experience, as i feel unsure as to how to approach this properly: by default imports won't pass `pkgs` in destructured form as well, unless using `pkgs.callPackage` (or manually passing `// pkgs`), which: - so far we weren't using - imposes some extra burden on the importer - seems aimed at package modules, which i'm not sure helps for the likes of e.g. NixOS modules

fricklerhandwerk was assigned by kiara

2025-06-19 11:09:12 +02:00

kiara added 1 commit

2025-06-19 11:09:14 +02:00

destructure pkgs argument in package modules

/ check-data-model (pull_request) Successful in 19s

Details

/ check-peertube (pull_request) Successful in 19s

Details

/ check-panel (pull_request) Successful in 1m21s

Details

/ check-deployment-basic (pull_request) Successful in 11m30s

Details

/ check-deployment-cli (pull_request) Successful in 38m39s

Details

/ check-pre-commit (pull_request) Successful in 13s

Details

/ check-deployment-panel (pull_request) Has been cancelled

Details

27398befd8

fricklerhandwerk commented

2025-06-19 11:45:33 +02:00

Owner

This change does not relate to #93, and arguably we don't need to expand the arguments -- pkgs can be taken from the test module argument, such as here: https://git.fediversity.eu/Fediversity/Fediversity/compare/main...fricklerhandwerk:peertube-test-refactor -- then the test is a module (as it should be, instead of a function call layering in a pkgs) and we invoke it from the outside.

On that note, nix-build services -A tests.mastodon fails with

       error: attribute 'id' missing
       at ~/src/Fediversity/services/tests/mastodon.nix:72:31:
           71|         environment.variables = {
           72|           AWS_ACCESS_KEY_ID = config.fediversity.garage.ensureKeys.mastodon.id;
             |                               ^
           73|           AWS_SECRET_ACCESS_KEY = config.fediversity.garage.ensureKeys.mastodon.secret;

and same for pixelfed-garage. cc @Niols.

This change does not relate to #93, and arguably we don't need to expand the arguments -- `pkgs` can be taken from the test module argument, such as here: https://git.fediversity.eu/Fediversity/Fediversity/compare/main...fricklerhandwerk:peertube-test-refactor -- then the test is a module (as it should be, instead of a function call layering in a `pkgs`) and we invoke it from the outside. On that note, `nix-build services -A tests.mastodon` fails with ```log error: attribute 'id' missing at ~/src/Fediversity/services/tests/mastodon.nix:72:31: 71| environment.variables = { 72| AWS_ACCESS_KEY_ID = config.fediversity.garage.ensureKeys.mastodon.id; | ^ 73| AWS_SECRET_ACCESS_KEY = config.fediversity.garage.ensureKeys.mastodon.secret; ``` and same for `pixelfed-garage`. cc @Niols.

kiara commented

2025-06-19 12:12:03 +02:00

Author

Owner

@fricklerhandwerk wrote in Fediversity/Fediversity#395 (comment):

nix-build services -A tests.mastodon fails with

       error: attribute 'id' missing
       at ~/src/Fediversity/services/tests/mastodon.nix:72:31:
           71|         environment.variables = {
           72|           AWS_ACCESS_KEY_ID = config.fediversity.garage.ensureKeys.mastodon.id;
             |                               ^
           73|           AWS_SECRET_ACCESS_KEY = config.fediversity.garage.ensureKeys.mastodon.secret;

and same for pixelfed-garage. cc @Niols.

i believe those have been regressions on main induced as they never worked in CI (#34 / #33), tho i'm not sure #13 is still relevant.

@fricklerhandwerk wrote in https://git.fediversity.eu/Fediversity/Fediversity/pulls/395#issuecomment-8024: > `nix-build services -A tests.mastodon` fails with > > ```log > error: attribute 'id' missing > at ~/src/Fediversity/services/tests/mastodon.nix:72:31: > 71| environment.variables = { > 72| AWS_ACCESS_KEY_ID = config.fediversity.garage.ensureKeys.mastodon.id; > | ^ > 73| AWS_SECRET_ACCESS_KEY = config.fediversity.garage.ensureKeys.mastodon.secret; > ``` > > and same for `pixelfed-garage`. cc @Niols. i believe those have been regressions on `main` induced as they never worked in CI (#34 / #33), tho i'm not sure #13 is still relevant.

kiara referenced this pull request

2025-06-19 12:21:13 +02:00

separate test declarations from invocations #396

kiara referenced this pull request

2025-06-19 12:23:08 +02:00

Write all modules with destructured arguments #93

kiara commented

2025-06-19 12:23:47 +02:00

Author

Owner

pkgs can be taken from the test module argument, such as here: https://git.fediversity.eu/Fediversity/Fediversity/compare/main...fricklerhandwerk:peertube-test-refactor -- then the test is a module (as it should be, instead of a function call layering in a pkgs) and we invoke it from the outside.

thanks, opened as #396 - closing in favor of that one then.

> `pkgs` can be taken from the test module argument, such as here: https://git.fediversity.eu/Fediversity/Fediversity/compare/main...fricklerhandwerk:peertube-test-refactor -- then the test is a module (as it should be, instead of a function call layering in a `pkgs`) and we invoke it from the outside. thanks, opened as #396 - closing in favor of that one then.

kiara closed this pull request

2025-06-19 12:23:47 +02:00