Skip to content

Take moscripts from GitHub, following this flake - #34

Merged
andrewthomaslee merged 1 commit into
mainfrom
moscripts-github-input
Nov 14, 2026
Merged

andrewthomaslee merged 1 commit into
mainfrom
moscripts-github-input

Conversation

@andrewthomaslee

Copy link
Copy Markdown
Member

Summary

 moscripts = {
-  url = "https://flakehub.com/f/andrewthomaslee/moscripts/*";
-  inputs.nixpkgs.follows = "nixpkgs";
+  url = "github:andrewthomaslee/moscripts";
+  inputs.org-pkgs.follows = "";   # "" = this flake
 };

moscripts was modernized to the org standard (andrewthomaslee/moscripts#1), so every one of its inputs follows org-pkgs. Pointing its org-pkgs at the root flake resolves nixpkgs, flake-parts, import-tree, uv2nix, pyproject-nix and build-system-pkgs to our pins.

Evidence

  • Before: flake.lock has 19 nodes, including uv2nix_2, pyproject-nix_2, pyproject-build-systems_2 and systems_2 (moscripts' own pins from 2025-08). moscripts came from the FlakeHub 0.1.0 tarball.
    After: 15 nodes. moscripts.inputs.org-pkgs = [], and every other moscripts input follows ["moscripts","org-pkgs",…]. It is locked at 4b47154.
  • pkgs.moscripts via overlays.default builds moscripts-0.2.0 with bin/{human_timestamp,motmp,mpv_playlists,password_generator}.
  • nix fmt → 0 changed. nix run .#flake-check → all checks passed.

Merge Danger

Door: two-way

Revert restores the FlakeHub pin.

Blast Radius: small

  • pkgs.moscripts becomes 0.2.0. Its CLI names are unchanged. Its closure now carries pinned gum, uv and mpv as PATH fallbacks; before, they were fetched at runtime with nix run.
  • Consumers lose 4 lock nodes on their next nix flake update org-pkgs.
  • Merge order: Bring moscripts up to the external-systems org standard andrewthomaslee/moscripts#1 (merged) → this → modules (nix flake update org-pkgs + sync-locks) → home.

🤖 Generated with Claude Code

moscripts now follows org-pkgs for nixpkgs, flake-parts and the uv2nix
pins. With `inputs.org-pkgs.follows = ""` it resolves all of them to this
flake's own inputs, so it locks one node instead of five (its own uv2nix,
pyproject.nix, build-system-pkgs and nix-systems), and the FlakeHub
tarball is replaced by the GitHub repo.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@andrewthomaslee
andrewthomaslee enabled auto-merge (squash) November 14, 2026 15:57
@andrewthomaslee
andrewthomaslee merged commit cd8dedf into main Nov 14, 2026
3 checks passed
andrewthomaslee added a commit to external-systems/modules that referenced this pull request Nov 14, 2026
pkgs now takes moscripts from GitHub with its org-pkgs input following
pkgs itself (external-systems/pkgs#34), so the lock drops moscripts' own
uv2nix, pyproject.nix, build-system-pkgs and nix-systems. sync-locks in
the same commit keeps devenv.lock on the same nixpkgs.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
andrewthomaslee added a commit to external-systems/home that referenced this pull request Nov 14, 2026
#54)

## Summary

```diff
 org-pkgs  → cd8dedf   (external-systems/pkgs#34: moscripts from GitHub, org-pkgs.follows = "")
 modules   → 551b179   (external-systems/modules#48: same org-pkgs bump)
-  moscripts' own uv2nix, pyproject-nix, pyproject-build-systems, systems
```

`nix flake update org-pkgs modules`, then `sync-locks` in the same
commit.

## Evidence

- **Before:** `flake.lock` has 58 nodes. netsa's `home.packages` has
moscripts 0.1.0 (FlakeHub).
**After:** 54 nodes. netsa's profile evaluates `moscripts-0.2.0` and
builds `/nix/store/sab5yqw…-moscripts-0.2.0`, the same path pkgs builds.
- `check` → exit 0, all checks passed, every machine evaluates. The only
warning is the existing `stdenv.isDarwin` deprecation.

## Merge Danger

**Door:** two-way

Lock-only change; revert restores the previous pins.

**Blast Radius:** netsa's profile

- moscripts 0.2.0 has the same CLI names. Its closure now includes
pinned `gum`, `uv` and `mpv`; before, they were fetched at runtime with
`nix run`.
- Deploy is the owner's step: `clan machines update kamrui-h1` (and the
other machines with netsa).
- Merge order: andrewthomaslee/moscripts#1 → pkgs#34 → modules#48 →
**this** (all upstream merged).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant