refactor(nix): use lib.fileset instead of nix-filter (#1247)

melange-re · Dec 8, 2024 · 9f7db9e · 9f7db9e
1 parent 053bcff
commit 9f7db9e
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 57 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,6 @@
   description = "Melange Nix Flake";
 
   inputs = {
-    nix-filter.url = "github:numtide/nix-filter";
     nixpkgs.url = "github:nix-ocaml/nix-overlays";
     melange-compiler-libs = {
       # this changes rarely, and it's better than having to rely on nix's poor
@@ -12,7 +11,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, nix-filter, melange-compiler-libs }:
+  outputs = { self, nixpkgs, melange-compiler-libs }:
     let
       forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:
         let
@@ -24,14 +23,12 @@
     in
     {
       overlays.default = import ./nix/overlay.nix {
-        nix-filter = nix-filter.lib;
         melange-compiler-libs-vendor-dir = melange-compiler-libs;
       };
 
       packages = forAllSystems (pkgs:
         let
           melange = pkgs.callPackage ./nix {
-            nix-filter = nix-filter.lib;
             melange-compiler-libs-vendor-dir = melange-compiler-libs;
           };
         in
@@ -40,7 +37,6 @@
           default = melange;
           melange-playground = pkgs.ocamlPackages.callPackage ./nix/melange-playground.nix {
             inherit melange;
-            nix-filter = nix-filter.lib;
             melange-compiler-libs-vendor-dir = melange-compiler-libs;
           };
         }

diff --git a/nix/default.nix b/nix/default.nix
@@ -5,7 +5,6 @@
 , git
 , tree
 , makeWrapper
-, nix-filter
 , nodejs
 , melange-compiler-libs-vendor-dir
 , doCheck ? true
@@ -18,23 +17,24 @@ buildDunePackage {
   version = "dev";
   duneVersion = "3";
 
-  src = with nix-filter; filter {
-    root = ./..;
-    include = [
-      "belt"
-      "bin"
-      "dune-project"
-      "dune"
-      "jscomp"
-      "lib"
-      "melange.opam"
-      "ppx"
-      "scripts"
-      "test"
-      "vendor"
-    ];
-    exclude = [ "jscomp/test" ];
-  };
+  src =
+    let fs = lib.fileset; in
+    fs.toSource {
+      root = ./..;
+      fileset = fs.unions [
+        ../belt
+        ../bin
+        ../dune-project
+        ../dune
+        (fs.difference ../jscomp ../jscomp/test)
+        ../melange.opam
+        ../ppx
+        ../scripts
+        ../test
+        ../vendor
+      ];
+    };
+
   postPatch = ''
     rm -rf vendor/melange-compiler-libs
     mkdir -p ./vendor

diff --git a/nix/melange-playground.nix b/nix/melange-playground.nix
@@ -1,6 +1,6 @@
 { melange
+, lib
 , buildDunePackage
-, nix-filter
 , cppo
 , menhir
 , nodejs
@@ -16,20 +16,23 @@ buildDunePackage {
   version = "dev";
   duneVersion = "3";
 
-  src = with nix-filter; filter {
-    root = ./..;
-    include = [
-      "belt"
-      "bin"
-      "dune-project"
-      "dune"
-      "jscomp"
-      "melange-playground.opam"
-      "playground"
-      "test/blackbox-tests/melange-playground"
-      "vendor"
-    ];
-  };
+  src =
+    let fs = lib.fileset; in
+    fs.toSource {
+      root = ./..;
+      fileset = fs.unions [
+        ../belt
+        ../bin
+        ../dune-project
+        ../dune
+        (fs.difference ../jscomp ../jscomp/test)
+        ../melange-playground.opam
+        ../playground
+        ../test/blackbox-tests/melange-playground
+        ../vendor
+      ];
+    };
+
   postPatch = ''
     rm -rf vendor/melange-compiler-libs
     mkdir -p ./vendor

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -1,4 +1,4 @@
-{ nix-filter, melange-compiler-libs-vendor-dir }:
+{ melange-compiler-libs-vendor-dir }:
 
 final: prev:
 
@@ -9,11 +9,11 @@ final: prev:
 
     {
       melange = prev.callPackage ./. {
-        inherit nix-filter melange-compiler-libs-vendor-dir;
+        inherit melange-compiler-libs-vendor-dir;
         doCheck = false;
       };
       melange-playground = prev.lib.callPackageWith oself ./melange-playground.nix {
-        inherit nix-filter melange-compiler-libs-vendor-dir;
+        inherit melange-compiler-libs-vendor-dir;
         inherit (prev) nodejs;
       };
     }