Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

texlive: fix tlmgr, tlshell, licenses #247798

Merged
merged 5 commits into from
Aug 19, 2023
Merged

Conversation

xworld21
Copy link
Contributor

@xworld21 xworld21 commented Aug 7, 2023

Description of changes

Minimal changes to make tlmgr and tlshell work when called with --usermode. Among the texlive.infra changes, it also adds the GPL2 and GPL2+ licenses for respective bin.core (which is included in all schemes) and tlmgr itself (whose license is not flagged in texlive.tlpdb).

This is hacky in that the shipped texlive.tlpdb does not contain the installed packages, so tlmgr/tlshell do not know which packages are already installed in the system tree. Generating the correct texlive.tlpdb seems tricky anyway.

Note: this includes a fix for the scheme licenses as reported in #247738 (review) and it is written on top of #247738. @apfelkuchen6 could you please double check why we had artistic1 and gpl1Only? I don't find them in tlpdb.nix nor in bin.nix so I am a little worried now at how they got in.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@xworld21 xworld21 requested review from apfelkuchen6 and veprbl August 7, 2023 19:06
@github-actions github-actions bot added the 6.topic: TeX Issues regarding texlive and TeX in general label Aug 7, 2023
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM

@veprbl
Copy link
Member

veprbl commented Aug 9, 2023

@GrahamcOfBorg build tests.texlive

@figsoda figsoda added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Aug 9, 2023
@xworld21 xworld21 mentioned this pull request Aug 14, 2023
12 tasks
@xworld21 xworld21 changed the title texlive: fix tlmgr and tlshell texlive: fix tlmgr, tlshell, licenses Aug 18, 2023
@xworld21 xworld21 force-pushed the texlive-tlmgr-tlshell branch from 8c8565c to 447fd50 Compare August 18, 2023 19:37
@xworld21
Copy link
Contributor Author

@GrahamcOfBorg build tests.texlive

@veprbl could you please merge, assuming the tests pass?

@ofborg ofborg bot requested a review from veprbl August 18, 2023 20:30
Copy link
Contributor

@apfelkuchen6 apfelkuchen6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

The artiistic1 and gpl1Only licenses appear to have been (incorrectly) pulled in by biber:

nix-repl> :p biber.meta.license
[ { deprecated = false; free = true; fullName = "Artistic License 1.0"; redistributable = true; shortName = "artistic1"; spdxId = "Artistic-1.0"; url = "https://spdx.org/licenses/Artistic-1.0.html"; } { deprecated = false; free = true; fullName = "GNU General Public License v1.0 or later"; redistributable = true; shortName = "gpl1Plus"; spdxId = "GPL-1.0-or-later"; url = "https://spdx.org/licenses/GPL-1.0-or-later.html"; } ]

As far as I can tell, the correct license is Artistic2 as indicated in tlpdb.

@veprbl
Copy link
Member

veprbl commented Aug 19, 2023

@xworld21 Sorry, this slipped by. Could you, please, rebase?

@xworld21 xworld21 force-pushed the texlive-tlmgr-tlshell branch from 447fd50 to b32c641 Compare August 19, 2023 20:30
@xworld21
Copy link
Contributor Author

@GrahamcOfBorg build tests.texlive.licenses

just in case!

@veprbl veprbl merged commit 88110b3 into NixOS:master Aug 19, 2023
@xworld21 xworld21 deleted the texlive-tlmgr-tlshell branch August 19, 2023 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: TeX Issues regarding texlive and TeX in general 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants