feat: use separate nixpkgs for js toolchains (#3229)

unionlabs · Nov 8, 2024 · a79c654 · a79c654
2 parents 77bd0dd + ca1138c
commit a79c654
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 197 deletions.
diff --git a/app/app.nix b/app/app.nix
@@ -1,35 +1,32 @@
 _: {
   perSystem =
     {
-      pkgs,
-      unstablePkgs,
       lib,
+      pkgs,
+      jsPkgs,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      pkgsDeps = with pkgs; [
-        pkg-config
+      deps = with jsPkgs; [
         python3
-      ];
-      nodeDeps = with unstablePkgs; [
+        pkg-config
         nodePackages_latest.nodejs
         nodePackages_latest."patch-package"
       ];
-      combinedDeps = pkgsDeps ++ nodeDeps;
       packageJSON = lib.importJSON ./package.json;
     in
     {
       packages = {
-        app = unstablePkgs.buildNpmPackage {
+        app = jsPkgs.buildNpmPackage {
           npmDepsHash = "sha256-yrqA4Qp7iiGvSo/Xk0G5adXdVqgK8nGYGdXtvLp7EPk=";
           src = ./.;
           sourceRoot = "app";
           npmFlags = [ "--enable-pre-post-scripts" ];
           pname = packageJSON.name;
           inherit (packageJSON) version;
-          nativeBuildInputs = combinedDeps;
-          buildInputs = combinedDeps;
+          nativeBuildInputs = deps;
+          buildInputs = deps;
           installPhase = ''
             mkdir -p $out
             cp -r ./build/* $out
@@ -44,7 +41,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "app-dev-server";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               cd app/
@@ -58,7 +55,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "app-dev-server";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               cd app/
@@ -72,7 +69,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "deploy-app-ipfs";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               cd app/

diff --git a/app/src/lib/graphql/queries/channels.ts b/app/src/lib/graphql/queries/channels.ts
@@ -1,6 +1,7 @@
 import { graphql } from "gql.tada"
 
-export const channelsQuery = graphql(/* GraphQL */ `query ChannelsQuery($limit: Int = 500) @cached(ttl: 30) {
+export const channelsQuery =
+  graphql(/* GraphQL */ `query ChannelsQuery($limit: Int = 500) @cached(ttl: 30) {
   v1_channels(
     where: {source_chain: {enabled: {_eq: true}}, destination_chain: {enabled: {_eq: true}}},
     order_by: [

diff --git a/biome.json b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.3/schema.json",
+  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",
@@ -227,8 +227,7 @@
         "noNestedTernary": "off",
         "noExportedImports": "off",
         "useImportRestrictions": "off",
-        "noDescendingSpecificity": "off",
-        "useExplicitFunctionReturnType": "off"
+        "noDescendingSpecificity": "off"
       },
       "performance": {
         "all": true,

diff --git a/ceremony/ceremony.nix b/ceremony/ceremony.nix
@@ -1,32 +1,31 @@
 _: {
   perSystem =
     {
-      pkgs,
-      unstablePkgs,
       lib,
+      pkgs,
+      jsPkgs,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      pkgsDeps = with pkgs; [
+      deps = with jsPkgs; [
         pkg-config
         python3
+        nodePackages_latest.nodejs
       ];
-      nodeDeps = with unstablePkgs; [ nodePackages_latest.nodejs ];
-      combinedDeps = pkgsDeps ++ nodeDeps;
       packageJSON = lib.importJSON ./package.json;
     in
     {
       packages = {
-        ceremony = unstablePkgs.buildNpmPackage {
+        ceremony = jsPkgs.buildNpmPackage {
           npmDepsHash = "sha256-2s556is4PJaGmxQhIUPZLINh6J6ngeTf32bwDtl+v6Q=";
           src = ./.;
           sourceRoot = "ceremony";
           npmFlags = [ "--legacy-peer-deps" ];
           pname = packageJSON.name;
           inherit (packageJSON) version;
-          nativeBuildInputs = combinedDeps;
-          buildInputs = combinedDeps;
+          nativeBuildInputs = deps;
+          buildInputs = deps;
           installPhase = ''
             mkdir -p $out
             cp -r ./build/* $out
@@ -44,7 +43,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "ceremony-dev-server";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               cd ceremony/

diff --git a/docs/docs.nix b/docs/docs.nix
@@ -4,23 +4,22 @@ _: {
       lib,
       pkgs,
       mkCi,
-      unstablePkgs,
+      jsPkgs,
       ensureAtRepositoryRoot,
       ...
     }:
     let
-      pkgsDeps = with pkgs; [ pkg-config ];
-      nodeDeps = with unstablePkgs; [
+      deps = with jsPkgs; [
         vips
+        pkg-config
         nodePackages_latest.nodejs
       ];
-      combinedDeps = pkgsDeps ++ nodeDeps;
       packageJSON = lib.importJSON ./package.json;
     in
     {
       packages = {
         docs = mkCi false (
-          unstablePkgs.buildNpmPackage {
+          jsPkgs.buildNpmPackage {
             npmDepsHash = "sha256-v2rwxCCKmbtwxAynUryTigfg0V4cmARh6HgfKTwFQds=";
             src = ./.;
             srcs = [
@@ -30,8 +29,8 @@ _: {
             sourceRoot = "docs";
             pname = packageJSON.name;
             inherit (packageJSON) version;
-            nativeBuildInputs = combinedDeps;
-            buildInputs = combinedDeps;
+            nativeBuildInputs = deps;
+            buildInputs = deps;
             installPhase = ''
               mkdir -p $out
               cp -r ./dist/* $out
@@ -49,7 +48,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "docs-dev-server";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               cd docs/
@@ -64,7 +63,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "docs-check";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               biome check docs --error-on-warnings --write --unsafe
@@ -84,7 +83,7 @@ _: {
           type = "app";
           program = pkgs.writeShellApplication {
             name = "deploy-docs-ipfs";
-            runtimeInputs = combinedDeps;
+            runtimeInputs = deps;
             text = ''
               ${ensureAtRepositoryRoot}
               cd docs/

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,6 +12,8 @@
     nixpkgs-go.url = "github:NixOS/nixpkgs/nixos-unstable";
     # Track a separate nixpkgs for unstable nixos
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # Track a separate nixpkgs for JS/TS toolchains
+    nixpkgs-js.url = "github:NixOS/nixpkgs/nixos-unstable";
     # Remove when lnav is updated on upstream nixpkgs
     nixpkgs-lnav.url = "github:cor/nixpkgs/lnav-v0.12.2-beta";
     process-compose.url = "github:F1bonacc1/process-compose";
@@ -94,11 +96,6 @@
       url = "github:CosmWasm/wasmvm/v2.1.3";
       flake = false;
     };
-    biome = {
-      url = "github:biomejs/biome/cli/v1.9.3";
-      flake = false;
-    };
-
     stargaze = {
       url = "git+https://github.com/public-awesome/stargaze?ref=main&submodules=1";
       flake = false;
@@ -247,7 +244,6 @@
         ./tools/rust/rust.nix
         ./tools/rust/crane.nix
         ./tools/tera/tera.nix
-        ./tools/biome/biome.nix
         ./tools/docgen/docgen.nix
         ./tools/hasura-cli/hasura-cli.nix
         ./tools/todo-comment.nix
@@ -272,7 +268,6 @@
           rust,
           system,
           lib,
-          biome,
           ...
         }:
         let
@@ -295,6 +290,7 @@
           };
 
           goPkgs = import inputs.nixpkgs-go { inherit system; };
+          jsPkgs = import inputs.nixpkgs-js { inherit system; };
           unstablePkgs = import inputs.nixpkgs-unstable { inherit system; };
         in
         {
@@ -306,6 +302,7 @@
                 get-flake
                 uniondBundleVersions
                 goPkgs
+                jsPkgs
                 unstablePkgs
                 mkCi
                 ;
@@ -496,10 +493,8 @@
                 self'.packages.tdc
                 yq
               ])
-              ++ (with unstablePkgs; [
-                wasm-tools
+              ++ (with jsPkgs; [
                 bun # for running TypeScript files on the fly
-                postgresql
                 emmet-language-server
                 nodePackages.graphqurl
                 nodePackages_latest.nodejs
@@ -510,6 +505,8 @@
                 nodePackages_latest.vscode-langservers-extracted
               ])
               ++ (with unstablePkgs; [
+                wasm-tools
+                postgresql
                 go_1_23
                 gopls
                 go-tools
@@ -554,8 +551,8 @@
               pkgs
               unstablePkgs
               goPkgs
+              jsPkgs
               rust
-              biome
               ;
           };
         };