From e03809f8e805fb68734250659451f0d86988140b Mon Sep 17 00:00:00 2001 From: Imani Manyara Date: Thu, 5 Nov 2026 04:45:48 -0500 Subject: [PATCH 1/2] State Pepicons' licence per variant and quote the commercial request All three shipped variants (pop, print, pencil) come from one npm package whose license field names CC BY 4.0, under one repository LICENSE that is the CC BY 4.0 legal code. The root README's request that commercial users buy a licence is in neither, and CC BY 4.0 is irrevocable, so the docs now quote it as a request beside the grant, with the sources read on 2026-11-05. --- ATTRIBUTION.md | 18 +++++++++++++++++- CHANGELOG.md | 1 + docs/attribution.md | 10 ++++++++++ docs/sets.md | 2 +- .../assets/svg/licenses/pepicons/source.md | 2 +- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index c38c96ba0..1b1b6f7e0 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -1145,7 +1145,23 @@ The Color style (3,145 files, 132 MB of gradients) and the 3D PNGs are not vendo - **Upstream**: [https://pepicons.com](https://pepicons.com), source [github.com/CyCraft/pepicons](https://github.com/CyCraft/pepicons) - **Author**: CyCraft - **Vendored**: npm pepicons 3.1.6 (tag v3.1.6); laid out as svg/{pop,print,pencil} flattened to -pop / -print / -pencil -- **Licence**: CC BY 4.0, `resources/assets/svg/licenses/pepicons/LICENSE`, read from LICENSE at tag v3.1.6 (the npm package ships none) on 2026-11-04, SHA-256 `dbb19cb7bda19afef40f19094a668dfe61375cfd57c49d33c660bdb76676b5c5` +- **Licence**: CC BY 4.0, `resources/assets/svg/licenses/pepicons/LICENSE`, read from LICENSE at tag v3.1.6 (the npm package ships none) on 2026-11-04, SHA-256 `dbb19cb7bda19afef40f19094a668dfe61375cfd57c49d33c660bdb76676b5c5`; re-read on 2026-11-05, unchanged at tag v3.1.6 and on `main` + +**Licence per variant.** All three variants come from the same npm package and the same repository, and none has terms of its own: + +| Variant | Files | Licence | Where upstream says so | +|---|---:|---|---| +| Pop! (`-pop`) | 1,275 | CC BY 4.0 | repository `LICENSE` (unchanged since 2021-07-27); npm `pepicons` 3.1.6 `license` field | +| Print (`-print`) | 1,275 | CC BY 4.0 | repository `LICENSE` (unchanged since 2021-07-27); npm `pepicons` 3.1.6 `license` field | +| Pencil (`-pencil`) | 1,275 | CC BY 4.0 | repository `LICENSE` (unchanged since 2021-07-27); npm `pepicons` 3.1.6 `license` field | + +**Upstream's commercial-use request.** Since 2022-09-09 the repository's root README has opened its License section with: "For commercial use please purchase a License at: https://github.com/sponsors/mesqueeb?frequency=one-time". That sentence is a request beside the licence, not a term of it: + +- It appears in neither the `LICENSE` file nor the npm package. `LICENSE` is the Creative Commons Attribution 4.0 legal code, word for word, under the line `Pepicons by © Copyright CyCraft, 2019 - today`; the README shipped inside the npm package (`packages/pepicons/README.md`) states CC BY 4.0 without the sentence; the package's `license` field reads `CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE`. +- The same README section goes on to say the set "falls under CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE". +- CC BY 4.0 grants its licence "worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable" (Section 2(a)(1)), with no non-commercial limit, and Section 7(b) treats any arrangement not stated in the licence as separate from and independent of it. + +So commercial use of the icons shipped here is licensed under CC BY 4.0, on its one condition: the credit below. If you use Pepicons commercially and want to support its authors, upstream asks for a one-time sponsorship at the link above. **Credit (CC BY 4.0).** Icons from [Pepicons](https://pepicons.com) by CyCraft, licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/). Changes: SVGs sanitised and renamed with a `-pop`, `-print` or `-pencil` suffix; no drawing was altered. diff --git a/CHANGELOG.md b/CHANGELOG.md index e01fbbeba..487d583a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to `ichava/icon-sets-extras` follow [Keep a Changelog](https ### Changed - **This pack requires `ichava/core` and nothing else.** `composer.json` `require` is now `php` and `ichava/core`; `illuminate/support` and `laranail/package-tools` were dropped from it and still arrive through core. The provider extends core's `IconPackServiceProvider` and declares its constants class and component class, so `src/` imports no `laranail/*` namespace; it registers the same name, path, Blade component and icon directory as before. The composer `type` is `ichava-icon-set`, which core's pack discovery reads. The README and `docs/installation.md` no longer restate the `laranail/*` repositories: they link to core's installation guide, the one place that lists them, and no longer say the pack is on Packagist, which no Ichava package is yet. `tests/Unit/CoreOnlyDependencyTest.php` fails if any of it comes back. +- **Pepicons' licence is stated per variant, and upstream's commercial-use request is quoted as a request.** Pop!, Print and Pencil (1,275 files each) are all CC BY 4.0: one npm package whose `license` field names it, under one repository `LICENSE` that is the CC BY 4.0 legal code with no commercial term. The repository's root README asks commercial users to buy a licence through a one-time sponsorship; that sentence is in neither the licence file nor the npm package, and CC BY 4.0 is irrevocable with no non-commercial limit, so it is a request beside the grant. `ATTRIBUTION.md` and `docs/attribution.md` say so, with sources read on 2026-11-05, and `PepiconsLicenceTest` fails on a fourth variant, a changed or commercial licence text, or a missing per-variant row. Nothing shipped changed. - **The hand-supplied licences of `ant-design`, `eva` and `pepicons` are marked with a `source.md`** beside each `LICENSE`, recording the upstream file, ref and SHA-256. Their npm packages ship no licence file, so without the marker a real sync would delete those directories. The upstream sync runs icon-sets-sync `cbebf08` (icon-sets-sync#89), up from `06b17d7`, the first commit whose licence sink accepts the lowercase marker. `SetLicenceTest` fails if a marker or a text goes missing. - **Licence files carry upstream's names, so the first sync of each set rewrites nothing** (icon-sets-sync#88). Game Icons' text is `licenses/game-icons/license.txt`, Zendesk Garden's and Siemens iX's are `LICENSE.md`, and SVG Logos' is `LICENSE.txt`, as their upstreams ship them; they had been renamed to `LICENSE`, which a sync would have written back under the upstream name. The bytes, and so the recorded SHA-256s, are unchanged. - **Radix Icons records `0.0.17` at `upstream.sets.radix-icons.current_version`**, the `website@0.0.17` archive tag the recipe fetches and stamps, instead of `1.3.2`, the version of `packages/radix-icons` inside that tag (still named in `ref`). With `1.3.2` recorded, the sync would have compared the wrong number with upstream's tags and rewritten the field on its first run. diff --git a/docs/attribution.md b/docs/attribution.md index 4dd3dc09a..38a0c36b8 100644 --- a/docs/attribution.md +++ b/docs/attribution.md @@ -26,6 +26,16 @@ dropped for its CC BY-SA icons. licence. The credit lines are in `ATTRIBUTION.md`, one per set, and one per contributor for Game Icons. +## Pepicons and its commercial-use request + +All three Pepicons variants in this pack (Pop!, Print and Pencil, the `-pop`, `-print` and +`-pencil` files) are CC BY 4.0: they come from one npm package, `pepicons` 3.1.6, whose `license` +field names CC BY 4.0, under one repository `LICENSE` holding the CC BY 4.0 legal code. Upstream's +root README also asks commercial users to buy a licence through a one-time GitHub sponsorship. That +sentence is not in the licence file or the npm package, and CC BY 4.0 is irrevocable and has no +non-commercial limit, so it is a request, not a condition. `ATTRIBUTION.md` quotes it in full, +with the sources and the date they were read. + ## Trademarks Devicon, SVG Logos and the Boxicons `bxl-` logos depict brands. Their licences cover the drawings, not the marks; a brand's own rules diff --git a/docs/sets.md b/docs/sets.md index 0a94859af..39d30414e 100644 --- a/docs/sets.md +++ b/docs/sets.md @@ -22,7 +22,7 @@ records each set's upstream, pinned version and licence under `upstream.sets`. | `health-icons` | Health Icons | 1,552 | 48×48, outline and filled | CC0-1.0 | | `devicon` | Devicon | 2,120 | 128×128 logos; original, plain, line and wordmark | MIT | | `fluent-emoji` | Fluent Emoji | 4,740 | flat and high-contrast, with skin tones | MIT | -| `pepicons` | Pepicons | 3,825 | 20×20; pop, print and pencil | CC BY 4.0 | +| `pepicons` | Pepicons | 3,825 | 20×20; pop, print and pencil, all three CC BY 4.0 | CC BY 4.0 | | `game-icons` | Game Icons | 4,178 | 512×512, white on a black square | CC BY 3.0 | | `coreui` | CoreUI Icons Free | 562 | 512×512 line icons | CC BY 4.0 | | `pinhead` | Pinhead | 2,747 | 15×15 map icons | CC0-1.0 | diff --git a/resources/assets/svg/licenses/pepicons/source.md b/resources/assets/svg/licenses/pepicons/source.md index 6c596e715..d4e757fe2 100644 --- a/resources/assets/svg/licenses/pepicons/source.md +++ b/resources/assets/svg/licenses/pepicons/source.md @@ -6,4 +6,4 @@ The npm package this set syncs from, `pepicons 3.1.6`, ships no licence file, so |---|---|---| | `LICENSE` | [CyCraft/pepicons `LICENSE` at tag `v3.1.6`](https://github.com/CyCraft/pepicons/blob/v3.1.6/LICENSE) (CC-BY-4.0) | `dbb19cb7bda19afef40f19094a668dfe61375cfd57c49d33c660bdb76676b5c5` | -Read on 2026-11-04 and reproduced byte for byte. When the set moves to a new upstream version, re-read the licence at the matching ref and update this table, `upstream.sets.pepicons.license` in `config.json`, `tests/Unit/SetLicenceTest.php` and `ATTRIBUTION.md` together. If the npm package starts shipping its own licence file, the sync warns and keeps this directory; compare the texts, then either keep it or delete this file so the sync copies upstream's. +Read on 2026-11-04 and reproduced byte for byte; re-read on 2026-11-05, when tag `v3.1.6` and `main` both still held this exact file. It covers all three variants the package ships (`svg/pop`, `svg/print`, `svg/pencil`). The upstream root README's request that commercial users buy a licence is not part of this file; `ATTRIBUTION.md` quotes it and explains why it is a request, and `tests/Unit/PepiconsLicenceTest.php` pins both. When the set moves to a new upstream version, re-read the licence at the matching ref and update this table, `upstream.sets.pepicons.license` in `config.json`, `tests/Unit/SetLicenceTest.php` and `ATTRIBUTION.md` together. If the npm package starts shipping its own licence file, the sync warns and keeps this directory; compare the texts, then either keep it or delete this file so the sync copies upstream's. From c696e551d9102b89876255f8c1a68fa613ee7c0f Mon Sep 17 00:00:00 2001 From: Imani Manyara Date: Thu, 5 Nov 2026 04:45:49 -0500 Subject: [PATCH 2/2] Pin Pepicons' variants, licence text and per-variant attribution Fails on a fourth variant, a changed licence text or one that gains a commercial term, a missing per-variant row in ATTRIBUTION.md, or the request being restated as a condition. Proven red by adding a stray variant file and editing the pencil row. --- tests/Unit/PepiconsLicenceTest.php | 94 ++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 tests/Unit/PepiconsLicenceTest.php diff --git a/tests/Unit/PepiconsLicenceTest.php b/tests/Unit/PepiconsLicenceTest.php new file mode 100644 index 000000000..0b7a14fe3 --- /dev/null +++ b/tests/Unit/PepiconsLicenceTest.php @@ -0,0 +1,94 @@ + suffix => files shipped at pepicons 3.1.6 */ +function pepicons_variants(): array +{ + return ['pop' => 1275, 'print' => 1275, 'pencil' => 1275]; +} + +/** The ATTRIBUTION.md section for the set, from its heading to the next set's. */ +function pepicons_attribution_section(): string +{ + $text = (string) file_get_contents(pepicons_root() . '/ATTRIBUTION.md'); + preg_match('/^### `pepicons`: Pepicons\n(.*?)(?=^### `)/ms', $text, $m); + + return $m[1] ?? ''; +} + +it(description: 'ships exactly the pop, print and pencil variants, at their pinned counts', closure: function () { + $files = glob(pepicons_root() . '/resources/assets/svg/files/pepicons/*.svg') ?: []; + expect(count($files))->toBe(array_sum(pepicons_variants())); + + $counts = []; + foreach ($files as $file) { + $matched = preg_match('/-(pop|print|pencil)\.svg$/', basename($file), $m); + $this->assertSame(1, $matched, basename($file) . ' is not a pop, print or pencil file; read its licence before shipping it'); + $counts[$m[1]] = ($counts[$m[1]] ?? 0) + 1; + } + ksort($counts); + $expected = pepicons_variants(); + ksort($expected); + expect($counts)->toBe($expected); +}); + +it(description: 'ships the CC BY 4.0 legal code with no commercial term', closure: function () { + $licence = (string) file_get_contents(pepicons_root() . '/resources/assets/svg/licenses/pepicons/LICENSE'); + $flat = (string) preg_replace('/\s+/', ' ', $licence); + + expect(hash('sha256', $licence))->toBe('dbb19cb7bda19afef40f19094a668dfe61375cfd57c49d33c660bdb76676b5c5'); + $this->assertStringStartsWith("Pepicons by © Copyright CyCraft, 2019 - today\n\nAttribution 4.0 International", $licence); + $this->assertStringContainsString('Creative Commons Attribution 4.0 International Public License', $flat); + $this->assertStringContainsString('worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license', $flat); + $this->assertStringContainsString('not stated herein are separate from and independent of the terms and conditions of this Public License', $flat); + $this->assertStringNotContainsStringIgnoringCase('commercial', $licence, 'the licence text now mentions commercial use; re-read upstream before shipping it'); + $this->assertStringNotContainsStringIgnoringCase('purchase', $licence); + $this->assertStringNotContainsString('github.com/sponsors', $licence); +}); + +it(description: 'states the licence of each variant in ATTRIBUTION.md', closure: function () { + $section = pepicons_attribution_section(); + expect($section)->not->toBe(''); + + $rows = [ + 'pop' => '| Pop! (`-pop`) | 1,275 | CC BY 4.0 |', + 'print' => '| Print (`-print`) | 1,275 | CC BY 4.0 |', + 'pencil' => '| Pencil (`-pencil`) | 1,275 | CC BY 4.0 |', + ]; + expect(array_keys($rows))->toBe(array_keys(pepicons_variants())); + foreach ($rows as $variant => $row) { + $this->assertStringContainsString($row, $section, "ATTRIBUTION.md does not state the licence of the {$variant} variant"); + } +}); + +it(description: 'quotes the commercial-use request verbatim, as a request and not a condition', closure: function () { + $section = pepicons_attribution_section(); + + $this->assertStringContainsString( + '"For commercial use please purchase a License at: https://github.com/sponsors/mesqueeb?frequency=one-time"', + $section, + ); + $this->assertStringContainsString('That sentence is a request beside the licence, not a term of it', $section); + $this->assertStringContainsString('commercial use of the icons shipped here is licensed under CC BY 4.0', $section); + + $docs = (string) file_get_contents(pepicons_root() . '/docs/attribution.md'); + $this->assertStringContainsString('so it is a request, not a condition', $docs); +});