Skip to content

Commit 7c7d4d1

Browse files
committed
Move dev src from lib to pluginDevSrc package
lib is for functions and is not supposed to depend on a specific system. The source is properly a package.
1 parent 80969c9 commit 7c7d4d1

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

dev/flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
phpExtensionsName = phpPackage + "Extensions";
6969
staticDeployPackage = getEnv "STATIC_DEPLOY_PACKAGE" "pluginWpOrg";
7070
wordpressPackage = getEnv "WORDPRESS_PACKAGE" "default";
71-
staticDeployLib = inputs.static-deploy.lib.${system};
7271
staticDeployPkgs = inputs.static-deploy.packages.${system};
7372
staticDeploy = staticDeployPkgs.${staticDeployPackage};
7473
# Note that /tmp/xd has to be created to receive traces
@@ -306,7 +305,7 @@
306305
mkdir -p "$TMPDIR"
307306
echo 'SELECT version();' | mysql -h 127.0.0.1 --port="${toString dbPort}" --user="${dbUserName}" --password="${dbUserPass}" "${dbName}"
308307
cp -r --no-preserve=mode ${staticDeployPkgs.composerVendor}/. .
309-
cp -r ${staticDeployLib.staticDeploySrc}/. .
308+
cp -r ${staticDeployPkgs.pluginDevSrc}/. .
310309
composer dump-autoload
311310
WORDPRESS_DIR="$(realpath ./data/wordpress1)"
312311
export WORDPRESS_DIR

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145
in
146146
{
147147
checks = { inherit staticDeployCheck; };
148-
lib = { inherit staticDeploySrc; };
149148
packages = {
150149
inherit composerVendor staticDeploy;
151150
plugin = staticDeploy;
151+
pluginDevSrc = staticDeploySrc;
152152
pluginGitHubSrc = staticDeployGitHubSrc;
153153
pluginWpOrg = staticDeployWpOrg;
154154
pluginWpOrgSrc = staticDeployWpOrgSrc;

0 commit comments

Comments
 (0)