From 8c9e63d12c5ea4c7afa0bd757bf1b24e246e0d8e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 4 Dec 2017 21:30:15 -0500 Subject: [PATCH] Move all the PHP stuff to a subdir --- default.nix | 20 +++++++++++++++++++ composer.json => php/composer.json | 0 composer.lock => php/composer.lock | 0 .../mass-rebuild-filter.php | 0 poster.php => php/poster.php | 0 {src => php/src}/ACL.php | 0 {src => php/src}/Checkout.php | 0 {src => php/src}/CommitStatus.php | 0 {src => php/src}/EventClassifier.php | 0 {src => php/src}/Exec.php | 0 {src => php/src}/NixBuild.php | 0 {src => php/src}/RebuildTagClassifier.php | 0 {src => php/src}/TestExec.php | 0 {src => php/src}/TestRebuildTagClassifier.php | 0 {web => php/web}/index.php | 0 15 files changed, 20 insertions(+) rename composer.json => php/composer.json (100%) rename composer.lock => php/composer.lock (100%) rename mass-rebuild-filter.php => php/mass-rebuild-filter.php (100%) rename poster.php => php/poster.php (100%) rename {src => php/src}/ACL.php (100%) rename {src => php/src}/Checkout.php (100%) rename {src => php/src}/CommitStatus.php (100%) rename {src => php/src}/EventClassifier.php (100%) rename {src => php/src}/Exec.php (100%) rename {src => php/src}/NixBuild.php (100%) rename {src => php/src}/RebuildTagClassifier.php (100%) rename {src => php/src}/TestExec.php (100%) rename {src => php/src}/TestRebuildTagClassifier.php (100%) rename {web => php/web}/index.php (100%) diff --git a/default.nix b/default.nix index f26ede4..faf61da 100644 --- a/default.nix +++ b/default.nix @@ -12,4 +12,24 @@ let in { ofborg.rs = stripDeps (pkgs.callPackage ./nix/ofborg-carnix.nix {}).ofborg_0_1_0; ircbot = stripDeps (pkgs.callPackage ./nix/ircbot-carnix.nix {}).ircbot_0_1_0; + + # /nix/store/a4xfsgh5bwh5w4m9y1j40ry4dq892gl4-ofborg/ + ofborg.php = pkgs.runCommand + "ofborg" + { + src = builtins.filterSource + (path: type: !( + (type == "symlink" && baseNameOf path == "result") + || (type == "directory" && baseNameOf path == ".git") + )) + ./php; + } + '' + cp -r $src ./ofborg + chmod -R u+w ./ofborg + cd ofborg + ls -la + cd .. + mv ofborg $out + ''; } diff --git a/composer.json b/php/composer.json similarity index 100% rename from composer.json rename to php/composer.json diff --git a/composer.lock b/php/composer.lock similarity index 100% rename from composer.lock rename to php/composer.lock diff --git a/mass-rebuild-filter.php b/php/mass-rebuild-filter.php similarity index 100% rename from mass-rebuild-filter.php rename to php/mass-rebuild-filter.php diff --git a/poster.php b/php/poster.php similarity index 100% rename from poster.php rename to php/poster.php diff --git a/src/ACL.php b/php/src/ACL.php similarity index 100% rename from src/ACL.php rename to php/src/ACL.php diff --git a/src/Checkout.php b/php/src/Checkout.php similarity index 100% rename from src/Checkout.php rename to php/src/Checkout.php diff --git a/src/CommitStatus.php b/php/src/CommitStatus.php similarity index 100% rename from src/CommitStatus.php rename to php/src/CommitStatus.php diff --git a/src/EventClassifier.php b/php/src/EventClassifier.php similarity index 100% rename from src/EventClassifier.php rename to php/src/EventClassifier.php diff --git a/src/Exec.php b/php/src/Exec.php similarity index 100% rename from src/Exec.php rename to php/src/Exec.php diff --git a/src/NixBuild.php b/php/src/NixBuild.php similarity index 100% rename from src/NixBuild.php rename to php/src/NixBuild.php diff --git a/src/RebuildTagClassifier.php b/php/src/RebuildTagClassifier.php similarity index 100% rename from src/RebuildTagClassifier.php rename to php/src/RebuildTagClassifier.php diff --git a/src/TestExec.php b/php/src/TestExec.php similarity index 100% rename from src/TestExec.php rename to php/src/TestExec.php diff --git a/src/TestRebuildTagClassifier.php b/php/src/TestRebuildTagClassifier.php similarity index 100% rename from src/TestRebuildTagClassifier.php rename to php/src/TestRebuildTagClassifier.php diff --git a/web/index.php b/php/web/index.php similarity index 100% rename from web/index.php rename to php/web/index.php