Make the file generation more transparent #203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thufschmitt
force-pushed
the
transparent-regen
branch
from
6395b35
to
f19f09d
Compare
yannham
approved these changes
May 28, 2024
| enrichedFlakeInputs = | ||
| flakeInputs | ||
| // { | ||
| "%%organist_internal".nickelLock = builtins.toFile "nickel.lock.ncl" (buildLockFileContents lockFileContents); |
There was a problem hiding this comment.
Could be nice to add a little comment explaining why we need to do that, for future you, me and others
There was a problem hiding this comment.
Has the doc been lost in a force push?I can't see it still
run-test.sh
Outdated
| @@ -120,7 +119,7 @@ test_example () ( | |||
| cp -r "$examplePath" ./example | |||
| pushd ./example | |||
| prepare_shell | |||
| nix run .\#regenerate-files --print-build-logs | |||
| # nix run .\#regenerate-files --print-build-logs | |||
There was a problem hiding this comment.
Is this line still there on purpose or should it just be scraped entirely?
There was a problem hiding this comment.
Nope, that's purely accidental. Removed it
thufschmitt
force-pushed
the
transparent-regen
branch
from
f19f09d
to
50e4fa2
Compare
|
It turns out that this blows-up the Nickel evaluation time (~x30 according to my benchmarks). I'll have to investigate why before we can merge this |
|
x30 for such a change is really suspicious... |
tweag/nickel#1930 seems to be the culprit (possibly also the real culprit for tweag/nickel#1630) |
thufschmitt
force-pushed
the
transparent-regen
branch
from
50e4fa2
to
8aea267
Compare
|
Rebased on top of #205 . Somehow, this sidesteps the performance issue 🥳 |
thufschmitt
force-pushed
the
transparent-regen
branch
from
8aea267
to
7ebc9b6
Compare
thufschmitt
force-pushed
the
only-export-flake
branch
from
090c89b
to
09a9f68
Compare
thufschmitt
force-pushed
the
transparent-regen
branch
from
7ebc9b6
to
e444d37
Compare
thufschmitt
force-pushed
the
transparent-regen
branch
2 times, most recently
from
26beeda
to
43dd787
Compare
thufschmitt
force-pushed
the
only-export-flake
branch
from
09a9f68
to
8d6e1bb
Compare
thufschmitt
force-pushed
the
transparent-regen
branch
from
43dd787
to
a32698b
Compare
yannham
approved these changes
Jun 25, 2024
| else | ||
| chmod +w sources | ||
| fi | ||
| cp $expectedLockfileContentsPath sources/nickel.lock.ncl |
There was a problem hiding this comment.
Suggested change
| cp $expectedLockfileContentsPath sources/nickel.lock.ncl | |
| cp "$expectedLockfileContentsPath" sources/nickel.lock.ncl |
| enrichedFlakeInputs = | ||
| flakeInputs | ||
| // { | ||
| "%%organist_internal".nickelLock = builtins.toFile "nickel.lock.ncl" (buildLockFileContents lockFileContents); |
There was a problem hiding this comment.
Has the doc been lost in a force push?I can't see it still
added 2 commits
June 26, 2024 17:49
Removes the need from running `regenerate-files` manually
This is in particular useful when the source file is generated with Nix.
Use for instance with:
```nickel
{
files."foo".file = nix.import_nix "nixpkgs#foo",
}
```
thufschmitt
force-pushed
the
transparent-regen
branch
from
3cac2d2
to
d9198a4
Compare
Avoids the need for an explicit `nix run .#regenerate-lockfile`
thufschmitt
force-pushed
the
transparent-regen
branch
from
d9198a4
to
2520576
Compare
Ensure that autocompletion works fine for simple things
Ooops Co-authored-by: Yann Hamdaoui <yann.hamdaoui@gmail.com>
Got bitten by tweag/topiary#654 once again Co-authored-by: Yann Hamdaoui <yann.hamdaoui@gmail.com>
thufschmitt
force-pushed
the
transparent-regen
branch
from
2520576
to
436e249
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Regenerate the files (defined in
files.*) automatically when entering the shell (if needed).Also unify that mechanism with the one used to generate the lockfile so that everything is generated at once.
The lockfile generation is slightly hacky because there's no easy way to pass its content from Nix to Nickel. But that'll have to do the job.