Filter the sources of development projects

svanderburg · Mar 1, 2022 · 299caca · 299caca
1 parent c1f98cd
commit 299caca
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/php-packages.nix b/php-packages.nix
@@ -18,7 +18,7 @@ in
 composerEnv.buildPackage {
   inherit packages devPackages noDev;
   name = "svanderburg-composer2nix";
-  src = ./.;
+  src = composerEnv.filterSrc ./.;
   executable = true;
   symlinkDependencies = false;
   meta = {

diff --git a/src/Composer2Nix/Package.php b/src/Composer2Nix/Package.php
@@ -67,7 +67,7 @@ public function toNixAST()
 	{
 		return new NixFunInvocation(new NixExpression("composerEnv.buildPackage"), array(
 			"name" => $this->composerConfig->packageName,
-			"src" => new NixFile("./."),
+			"src" => new NixFunInvocation(new NixExpression("composerEnv.filterSrc"), new NixFile("./.")),
 			"executable" => $this->executable,
 			"packages" => new NixInherit(),
 			"devPackages" => new NixInherit(),

diff --git a/src/Composer2Nix/composer-env.nix b/src/Composer2Nix/composer-env.nix
@@ -4,6 +4,10 @@
 
 let
   inherit (phpPackages) composer;
+
+  filterSrc = src:
+    builtins.filterSource (path: type: type != "directory" || (baseNameOf path != ".git" && baseNameOf path != ".git" && baseNameOf path != ".svn")) src;
+
   buildZipPackage = { name, src }:
     stdenv.mkDerivation {
       inherit name src;
@@ -233,6 +237,7 @@ let
   } // extraArgs);
 in
 {
+  inherit filterSrc;
   composer = lib.makeOverridable composer;
   buildZipPackage = lib.makeOverridable buildZipPackage;
   buildPackage = lib.makeOverridable buildPackage;

diff --git a/tests/dependencies/php-packages.nix b/tests/dependencies/php-packages.nix
@@ -377,7 +377,7 @@ in
 composerEnv.buildPackage {
   inherit packages devPackages noDev;
   name = "dependencies";
-  src = ./.;
+  src = composerEnv.filterSrc ./.;
   executable = false;
   symlinkDependencies = false;
   meta = {};

diff --git a/tests/enduser/php-packages.nix b/tests/enduser/php-packages.nix
@@ -348,7 +348,7 @@ in
 composerEnv.buildPackage {
   inherit packages devPackages noDev;
   name = "phpunit-phpunit";
-  src = ./.;
+  src = composerEnv.filterSrc ./.;
   executable = true;
   symlinkDependencies = false;
   meta = {};