darkkirb/composer2nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter the sources of development projects

Browse source
This commit is contained in:
Sander van der Burg 2022-03-02 00:41:50 +01:00
parent c1f98cdac1
commit 299caca4aa
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
php-packages.nix
View file

@ -18,7 +18,7 @@ in
composerEnv.buildPackage { composerEnv.buildPackage {
inherit packages devPackages noDev; inherit packages devPackages noDev;
name = "svanderburg-composer2nix"; name = "svanderburg-composer2nix";
src = ./.; src = composerEnv.filterSrc ./.;
executable = true; executable = true;
symlinkDependencies = false; symlinkDependencies = false;
meta = { meta = {

2
src/Composer2Nix/Package.php
View file

@ -67,7 +67,7 @@ class Package extends NixASTNode
{ {
return new NixFunInvocation(new NixExpression("composerEnv.buildPackage"), array( return new NixFunInvocation(new NixExpression("composerEnv.buildPackage"), array(
"name" => $this->composerConfig->packageName, "name" => $this->composerConfig->packageName,
"src" => new NixFile("./."), "src" => new NixFunInvocation(new NixExpression("composerEnv.filterSrc"), new NixFile("./.")),
"executable" => $this->executable, "executable" => $this->executable,
"packages" => new NixInherit(), "packages" => new NixInherit(),
"devPackages" => new NixInherit(), "devPackages" => new NixInherit(),

5
src/Composer2Nix/composer-env.nix
View file

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

2
tests/dependencies/php-packages.nix
View file

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

2
tests/enduser/php-packages.nix
View file

@ -348,7 +348,7 @@ in
composerEnv.buildPackage { composerEnv.buildPackage {
inherit packages devPackages noDev; inherit packages devPackages noDev;
name = "phpunit-phpunit"; name = "phpunit-phpunit";
src = ./.; src = composerEnv.filterSrc ./.;
executable = true; executable = true;
symlinkDependencies = false; symlinkDependencies = false;
meta = {}; meta = {};