Merge pull request #106 from MatrixAI/feature-flake-indirect

Indirect package set flake input
MatrixAI · Sep 19, 2024 · 3cd9714 · 3cd9714
2 parents b37aa73 + 3955031
commit 3cd9714
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 151 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,54 +1,45 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs";
+    nixpkgs-matrix = {
+      type = "indirect";
+      id = "nixpkgs-matrix";
+    };
     flake-utils.url = "github:numtide/flake-utils";
-
-    nixpkgs.follows = "nixpkgs-matrix/nixpkgs";
-    nixpkgs-matrix.url = "github:matrixai/nixpkgs-matrix";
   };
 
-  outputs = { nixpkgs, flake-utils, ... }:
+  outputs = { nixpkgs-matrix, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs {
-          inherit system;
-        };
+        pkgs = nixpkgs-matrix.legacyPackages.${system};
 
-        shell = { ci ? false }: with pkgs; mkShell {
-          nativeBuildInputs = [
-            nodejs
-            shellcheck
-            patchelf
-            gitAndTools.gh
-          ];
-          shellHook = ''
-            echo "Entering $(npm pkg get name)"
-            set -o allexport
-            . ./.env
-            set +o allexport
-            set -v
-            ${
-              lib.optionalString ci
-              ''
-              set -o errexit
-              set -o nounset
-              set -o pipefail
-              shopt -s inherit_errexit
-              ''
-            }
-            mkdir --parents "$(pwd)/tmp"
-            export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"
-            npm install --ignore-scripts
-            if [ -f 'node_modules/@cloudflare/workerd-linux-64/bin/workerd' ]; then
-              patchelf \
-                --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-                node_modules/@cloudflare/workerd-linux-64/bin/workerd
-            fi
-            set +v
-          '';
-        };
-      in
-      {
+        shell = { ci ? false }:
+          with pkgs;
+          mkShell {
+            nativeBuildInputs = [ nodejs shellcheck patchelf gitAndTools.gh ];
+            shellHook = ''
+              echo "Entering $(npm pkg get name)"
+              set -o allexport
+              . ./.env
+              set +o allexport
+              set -v
+              ${lib.optionalString ci ''
+                set -o errexit
+                set -o nounset
+                set -o pipefail
+                shopt -s inherit_errexit
+              ''}
+              mkdir --parents "$(pwd)/tmp"
+              export PATH="$(pwd)/dist/bin:$(npm root)/.bin:$PATH"
+              npm install --ignore-scripts
+              if [ -f 'node_modules/@cloudflare/workerd-linux-64/bin/workerd' ]; then
+                patchelf \
+                  --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+                  node_modules/@cloudflare/workerd-linux-64/bin/workerd
+              fi
+              set +v
+            '';
+          };
+      in {
         devShells = {
           default = shell { ci = false; };
           ci = shell { ci = true; };