chore(nix): remove flake-utils / nix-filter (#17)

Author: anmonteiro

flake.lock

@@ -1,73 +1,95 @@
 {
   description = "melange-jest Nix Flake";
 
-  inputs.nix-filter.url = "github:numtide/nix-filter";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs = {
-    url = "github:nix-ocaml/nix-overlays";
-    inputs.flake-utils.follows = "flake-utils";
-  };
+  inputs.nixpkgs.url = "github:nix-ocaml/nix-overlays";
 
-  outputs = { self, nixpkgs, flake-utils, nix-filter }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
-          ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
-        });
-        inherit (pkgs) nodejs_latest lib stdenv darwin yarn cacert;
+  outputs = { self, nixpkgs }:
+    let
+      forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: {
+            ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
+          });
+        in
+        f pkgs);
+    in
+    {
+      packages = forAllSystems (pkgs:
+        let
+          inherit (pkgs) nodejs_latest lib stdenv darwin yarn cacert;
 
-        checkPhaseNodePackages = pkgs.buildNpmPackage {
-          name = "melange-jest-deps";
-          version = "0.0.0-dev";
+          checkPhaseNodePackages = pkgs.buildNpmPackage {
+            name = "melange-jest-deps";
+            version = "0.0.0-dev";
+            src =
+              let fs = pkgs.lib.fileset; in
+              fs.toSource {
+                root = ./.;
+                fileset = fs.unions [
+                  ./dune-project
+                  ./dune
+                  ./melange-jest.opam
+                  ./melange-jest.opam.template
+                  ./jest
+                  ./jest-dom
+                  ./jest.config.js
+                  ./package.json
+                  ./package-lock.json
+                ];
+              };
 
-          src = ./.;
-          dontNpmBuild = true;
-          npmDepsHash = "sha256-T0oSCDJtwK0vNwoQQBgRtgcrz/1/gfIEUaz2uHgVKKY=";
-          installPhase = ''
-            runHook preInstall
-            mkdir -p "$out"
-            cp -r ./node_modules "$out/node_modules"
-            runHook postInstall
-          '';
-        };
 
-        melange-jest = with pkgs.ocamlPackages; buildDunePackage {
-          pname = "melange-jest";
-          version = "dev";
+            dontNpmBuild = true;
+            npmDepsHash = "sha256-T0oSCDJtwK0vNwoQQBgRtgcrz/1/gfIEUaz2uHgVKKY=";
+            installPhase = ''
+              runHook preInstall
+              mkdir -p "$out"
+              cp -r ./node_modules "$out/node_modules"
+              runHook postInstall
+            '';
+          };
 
-          src = ./.;
-          nativeBuildInputs = with pkgs.ocamlPackages; [ melange ];
-          propagatedBuildInputs = with pkgs.ocamlPackages; [ melange ];
-          doCheck = true;
-          nativeCheckInputs = [ reason nodejs_latest yarn cacert ];
-          checkInputs = [ melange-webapi cacert checkPhaseNodePackages ];
-          checkPhase = ''
-            dune build @all -p melange-jest --display=short
-            ln -sfn "${checkPhaseNodePackages}/node_modules" ./node_modules
-            ./node_modules/.bin/jest
-          '';
-        };
+          melange-jest = with pkgs.ocamlPackages; buildDunePackage {
+            pname = "melange-jest";
+            version = "dev";
 
-        mkShell = { buildInputs ? [ ] }: pkgs.mkShell {
-          inputsFrom = [ melange-jest ];
-          nativeBuildInputs = with pkgs; [
-            yarn
-            nodejs_latest
-          ] ++ (with pkgs.ocamlPackages; [
-            ocamlformat
-            merlin
-            reason
-          ]);
-          inherit buildInputs;
-        };
-      in
-      rec {
-        packages.default = melange-jest;
-        devShells = {
+            src = ./.;
+            nativeBuildInputs = with pkgs.ocamlPackages; [ melange ];
+            propagatedBuildInputs = with pkgs.ocamlPackages; [ melange ];
+            doCheck = true;
+            nativeCheckInputs = [ reason nodejs_latest yarn cacert ];
+            checkInputs = [ melange-webapi cacert checkPhaseNodePackages ];
+            checkPhase = ''
+              dune build @all -p melange-jest --display=short
+              ln -sfn "${checkPhaseNodePackages}/node_modules" ./node_modules
+              ./node_modules/.bin/jest
+            '';
+          };
+        in
+        {
+          inherit melange-jest;
+          default = melange-jest;
+        });
+      devShells = forAllSystems (pkgs:
+        let
+          mkShell = { buildInputs ? [ ] }: pkgs.mkShell {
+            inputsFrom = [ self.packages.${pkgs.system}.melange-jest ];
+            nativeBuildInputs = with pkgs; [
+              yarn
+              nodejs_latest
+            ] ++ (with pkgs.ocamlPackages; [
+              ocamlformat
+              merlin
+              reason
+            ]);
+            inherit buildInputs;
+          };
+        in
+        {
           default = mkShell { };
           release = mkShell {
             buildInputs = with pkgs; [ cacert curl ocamlPackages.dune-release git ];
           };
-        };
-      });
+        });
+    };
 }