Versioning poc#1
Conversation
| { | ||
| "modules": { | ||
| "nodejs-18.12-m1.1": { | ||
| "commit": "4ec006c0eb247320e77c0abbf46b6f9e33370f81", |
There was a problem hiding this comment.
We are going to have to disallow rebase merging. Otherwise, the commits we save in the the lockfile might not end up in the registry. Another solution would be to generate the registry automatically in CI on the main branch.
There was a problem hiding this comment.
What makes rebase merging different from normal merging? In either case, it's up to the developer merging the conflict to keep both changes in the lock file. Right?
There was a problem hiding this comment.
It changes the git commit SHAs when it rewrites the history.
| let | ||
| mkModule = path: pkgs.callPackage ./moduleit/entrypoint.nix { | ||
| configPath = path; | ||
| modules = import ./modules { |
There was a problem hiding this comment.
this is importing modules in a second place in addition to the top level outputs.modules. I'd prefer to pass self into the pkgs evaluation and get the modules from self.modules
| let | ||
| parts = pkgs.lib.strings.splitString "." version; | ||
| major = builtins.elemAt parts 0; | ||
| minor = builtins.elemAt parts 1; |
There was a problem hiding this comment.
https://github.com/NixOS/nixpkgs/blob/master/lib/versions.nix there are already major and minor functions you could use here.
pruneVersion = lib.majorMinor
There was a problem hiding this comment.
👍 I thought there might be.
Co-authored-by: Ryan Mulligan <ryan@ryantm.com>
The current derivation builds upstream databricks/cli v0.286.0 from
source via buildGoModule. This commit:
- Points src at the Replit fork (replit/databricks-cli) at tag
v0.299.0-replit.1, which is upstream v0.299.0 plus our
'sync: add --concurrency and --retry-timeout flags' patch (#1).
pid2's deploy path needs that flag.
- Replaces the 13-entry checkFlags skip list with doCheck = false.
Bumping from v0.286.0 to v0.299.0 surfaced a new test that hangs in
the sandbox (TestClearWorkspaceClient blocks on workspace client DNS
resolution and times out at 10 minutes). Rather than play whack-a-
mole with new offenders on every rebase, we skip the whole check
phase and trust upstream CI -- same pattern pkgs/modules/python/uv
and the docker stack already use in this repo.
- Updates meta.homepage and meta.changelog to point at the fork.
Test plan
nix build .#'"databricks-cli"' succeeds.
databricks --version reports 'Databricks CLI v0.299.0-replit.1'.
databricks sync --help shows --concurrency and --retry-timeout flags.
nix fmt --check passes.
Slack thread:
https://replit.slack.com/archives/C0A2Z9042FR/p1778082184841149
2 participants
Why?
We need to implement a versioning scheme that'll work in the short term and in the long term.
See https://replit.com/@util/Design-docs#goval/nixmodules_versions.md for more context.
Changes
lock_modules.pyscript for generating the module registry and pinning module versionsidandcommunity-versionfields to module definitionpkgs/modules/default.nixpkgs/modules