From 64baa6d290042bd89c1f824e8d3ab9f0a1203f77 Mon Sep 17 00:00:00 2001 From: doprz <52579214+doprz@users.noreply.github.com> Date: Sun, 12 Oct 2025 20:47:47 -0700 Subject: [PATCH] refactor(nix): dev shells (#634) --- flake.lock | 6 +++--- flake.nix | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 081117fe..31fe6379 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1759831965, + "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "c9b6fb798541223bbb396d287d16f43520250518", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7841752f..6dbdba38 100644 --- a/flake.nix +++ b/flake.nix @@ -14,22 +14,29 @@ system: let pkgs = (import nixpkgs { inherit system; }); + + commonPackages = with pkgs; [ + nodejs_20 # v20.19.5 + pnpm_10 # v10.18.0 + ]; + + additionalPackages = with pkgs; [ + bun + nodePackages.conventional-changelog-cli + sentry-cli + ]; in { formatter = pkgs.nixfmt-rfc-style; devShells.default = pkgs.mkShell { name = "utrp-dev"; - buildInputs = with pkgs; [ - nodejs_20 # v20.19.4 - pnpm_10 # v10.14.0 - ]; + buildInputs = commonPackages; + }; - shellHook = '' - echo "UTRP Nix Flake Environment Loaded" - echo "Node: $(node --version)" - echo "pnpm: $(pnpm --version)" - ''; + devShells.full = pkgs.mkShell { + name = "utrp-dev-full"; + buildInputs = commonPackages ++ additionalPackages; }; } );