|
24 | 24 | pname = "${name}-composer-deps";
|
25 | 25 | version = "1.0.0";
|
26 | 26 | src = composerSrc;
|
27 |
| - vendorHash = "sha256-4eHxmlB7KQsEn1gCTGPJzklnYTrRzpI+Pt8ccrl7Jkc="; |
| 27 | + vendorHash = "sha256-c7zv3Wprd5rSeDpRLcfBkMEADDrJP5O0XKYQOIk1mSM="; |
28 | 28 | });
|
29 | 29 | composerVendorDev = php.mkComposerVendor (finalAttrs: {
|
30 | 30 | composerNoDev = false;
|
31 | 31 | pname = "${name}-composer-deps-dev";
|
32 | 32 | version = "1.0.0";
|
33 | 33 | src = composerSrc;
|
34 |
| - vendorHash = "sha256-4M4bKmJMZyM+DMVIUwKdbhC6rI+xIDtAtWHu1l9JAS4="; |
| 34 | + vendorHash = "sha256-WJ3zfADVJQTLeWLlDBTX34O90SHxLTgIy1nvqUqPIfE="; |
35 | 35 | });
|
36 | 36 | staticDeploySrc = pkgs.lib.cleanSourceWith {
|
37 | 37 | src = self;
|
|
46 | 46 | && pkgs.lib.hasSuffix ".php" base || base == "composer.json" || base
|
47 | 47 | == "composer.lock" || base == "phpcs.xml" || base == "phpunit.xml";
|
48 | 48 | };
|
49 |
| - # Sources used for GitHub releases but not for WordPress.org |
50 |
| - staticDeploySrcGitHub = pkgs.lib.cleanSourceWith { |
51 |
| - src = self; |
52 |
| - filter = path: type: |
53 |
| - let base = baseNameOf path; |
54 |
| - in type == "directory" && base == "src-github" |
55 |
| - || pkgs.lib.hasInfix "/src-github/" path; |
56 |
| - }; |
57 | 49 | wpOrgExtras = pkgs.lib.cleanSourceWith {
|
58 | 50 | src = self;
|
59 | 51 | filter = path: type:
|
|
71 | 63 |
|
72 | 64 | # Lock certain constants and run rector to remove dead code
|
73 | 65 | cp ${wpOrgExtras}/wp-org/constants.php constants.php
|
74 |
| - mkdir src-github # Prevent an error |
75 | 66 | composer rector
|
76 | 67 |
|
77 | 68 | mkdir -p "$out"
|
|
85 | 76 | cd "$PLUGIN_DIR"
|
86 | 77 | cp -r --no-preserve=mode "${composerVendor}"/* .
|
87 | 78 | cp -r --no-preserve=mode "${staticDeploySrc}"/* .
|
88 |
| - cp -r --no-preserve=mode "${staticDeploySrcGitHub}"/src-github/* ./src |
89 | 79 | ${phpPackages.composer}/bin/composer dump-autoload --no-dev --optimize
|
90 | 80 | rm composer.json composer.lock
|
91 | 81 | mkdir -p $out
|
|
113 | 103 | cd "$PLUGIN_DIR"
|
114 | 104 | cp -a "${composerVendorDev}/vendor" .
|
115 | 105 | cp -r --no-preserve=mode "$src"/* .
|
116 |
| - cp -a "${staticDeploySrcGitHub}"/* . |
117 | 106 | composer lint
|
118 | 107 | composer phpcs
|
119 | 108 | # Run directly because composer swallows the exit code
|
|
0 commit comments