From 42404bfd7ef476e6a83cedbadf4dea1688788f53 Mon Sep 17 00:00:00 2001 From: PJalv Date: Sun, 12 Apr 2026 15:36:58 -0700 Subject: [PATCH 1/4] feat: add Nix flake for package distribution Enables installation via NixOS configuration without requiring npx. Includes: - buildNpmPackage derivation for the CLI - NixOS module for easy system integration - Dev shell with Node.js 22 - Overlay for use in other flakes --- flake.lock | 27 +++++++++++++++++++ flake.nix | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..77972fb4 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 00000000..282c82bf --- /dev/null +++ b/flake.nix @@ -0,0 +1,76 @@ +{ + description = "mex - CLI engine for scaffold drift detection, pre-analysis, and targeted sync"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; + + outputs = { self, nixpkgs }: + let + supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + in + { + packages = forAllSystems (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + default = pkgs.buildNpmPackage { + pname = "mex"; + version = "0.3.2"; + + src = ./.; + + npmDepsHash = "sha256-5gqoL5TeF7giN/qM7VfqY33rutlkmnIbq6FYPBTF3QE="; + + npmBuildScript = "build"; + + # Ensure templates directory is included + postInstall = '' + mkdir -p $out/lib/node_modules/promexeus/templates + cp -r templates/* $out/lib/node_modules/promexeus/templates/ + ''; + + meta = with pkgs.lib; { + description = "CLI engine for mex scaffold — drift detection, pre-analysis, and targeted sync"; + homepage = "https://github.com/PJalv/mex"; + license = licenses.mit; + mainProgram = "mex"; + platforms = supportedSystems; + }; + }; + }); + + overlays.default = final: prev: { + mex = self.packages.${final.system}.default; + }; + + nixosModules.default = { config, lib, pkgs, ... }: + let + cfg = config.programs.mex; + in + { + options.programs.mex = { + enable = lib.mkEnableOption "mex - scaffold drift detection CLI"; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ self.packages.${pkgs.system}.default ]; + }; + }; + + devShells = forAllSystems (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + nodejs_22 + npm + ]; + }; + }); + }; +} From 295f4c281832fda7da4518ed08c2f6384dff1e70 Mon Sep 17 00:00:00 2001 From: PJalv Date: Sun, 12 Apr 2026 15:36:58 -0700 Subject: [PATCH 2/4] fix: update version to 0.4.0 to match CLI --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 282c82bf..6e426dc3 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ { default = pkgs.buildNpmPackage { pname = "mex"; - version = "0.3.2"; + version = "0.4.0"; src = ./.; From a7d8b0fb835fca96c879b2303a6b70a8a642d697 Mon Sep 17 00:00:00 2001 From: PJalv Date: Sun, 12 Apr 2026 15:36:58 -0700 Subject: [PATCH 3/4] fix: remove redundant npm from dev shell (bundled with nodejs) --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6e426dc3..72c893f4 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ meta = with pkgs.lib; { description = "CLI engine for mex scaffold — drift detection, pre-analysis, and targeted sync"; - homepage = "https://github.com/PJalv/mex"; + homepage = "https://github.com/theDakshJaitly/mex"; license = licenses.mit; mainProgram = "mex"; platforms = supportedSystems; @@ -68,7 +68,6 @@ default = pkgs.mkShell { buildInputs = with pkgs; [ nodejs_22 - npm ]; }; }); From e83252a5c33839aedb2538533ba5ebf21d7f72e0 Mon Sep 17 00:00:00 2001 From: PJalv Date: Sun, 12 Apr 2026 18:39:13 -0700 Subject: [PATCH 4/4] fix: address PR review feedback - Use version 0.3.2 to match package.json - Add comment explaining how to update npmDepsHash - Add 'result' symlink to .gitignore --- .gitignore | 3 +++ flake.nix | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e306ffa4..b288b54e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,8 @@ node_modules/ dist/ +# Nix +result + # OS Thumbs.db diff --git a/flake.nix b/flake.nix index 72c893f4..49665995 100644 --- a/flake.nix +++ b/flake.nix @@ -18,10 +18,12 @@ { default = pkgs.buildNpmPackage { pname = "mex"; - version = "0.4.0"; + version = "0.3.2"; src = ./.; + # Update this hash when package-lock.json changes: + # nix build 2>&1 | grep 'got:' | awk '{print $2}' npmDepsHash = "sha256-5gqoL5TeF7giN/qM7VfqY33rutlkmnIbq6FYPBTF3QE="; npmBuildScript = "build";