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: make updmap actually regenerate (#76826) #76867

Merged
merged 3 commits into from Jan 7, 2020

Conversation

@mikesperber
Copy link
Contributor

@mikesperber mikesperber commented Jan 3, 2020

The --syncwithtrees flag made updmap not regenerate the map files,
effectively leaving stale map files in place.

Motivation for this change

Closes: #76826

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @veprbl

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 3, 2020

Does "updmap --sys" include the operation of "updmap --sys −−syncwithtrees"? If not, this may break schemes smaller than scheme-full.

@mikesperber
Copy link
Contributor Author

@mikesperber mikesperber commented Jan 3, 2020

I'm not sure what that operation is: The effect I observed is that is causes no map file to be written, leaving the one from the distribution in place.

From the documentation, it seems that the effect should be that it removes entries in pdftex.map in place where the corresponding map file can't be found. But AFAICS, it doesn't remove (or add or change) anything, so the issue is moot: Either I'm misunderstanding what the flag is supposed to do, or there's a bug with updmap.

In any case, I don't see any harm leaving entries in the map file for fonts that are not in the package - after all, you can't create references to these entries if the corresponding package isn't there.

PS: Thanks for looking into this!

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 3, 2020

@GrahamcOfBorg build texlive.combined.scheme-small

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 3, 2020

@mikesperber It breaks texlive.combined.scheme-small.

@mikesperber mikesperber force-pushed the active-group:unbreak-texlive-updmap branch from dcb92c8 to 1e1080e Jan 3, 2020
The --syncwithtrees flag only updates the config files, so run it
again without --syncwithtrees to generate the actual map files.
@mikesperber mikesperber force-pushed the active-group:unbreak-texlive-updmap branch from 1e1080e to 7e298dd Jan 3, 2020
@mikesperber
Copy link
Contributor Author

@mikesperber mikesperber commented Jan 3, 2020

@veprbl Ah, I see now: --syncwithtrees only updates the config files, prevents the map files from being generated. Just updated the pull request and checked that texlive.combined.scheme-small. (Sorry about the intermediate breakage.)

@veprbl
Copy link
Member

@veprbl veprbl commented Jan 3, 2020

@GrahamcOfBorg build texlive.combined.scheme-small
@GrahamcOfBorg build texlive.combined.scheme-full

@veprbl veprbl self-assigned this Jan 3, 2020
veprbl added 2 commits Jan 7, 2020
@veprbl
veprbl approved these changes Jan 7, 2020
@veprbl
Copy link
Member

@veprbl veprbl commented Jan 7, 2020

I guess, the original issue was caused by an inconsistency in the snapshot that we are using.

@veprbl veprbl merged commit c0b70f0 into NixOS:master Jan 7, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Jan 7, 2020
* texlive: make updmap actually regenerate (NixOS#76826)

The --syncwithtrees flag only updates the config files, so run it
again without --syncwithtrees to generate the actual map files.

* ! fixup

* ! fixup

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
(cherry picked from commit c0b70f0)
@veprbl veprbl removed their assignment Jan 7, 2020
@mikesperber
Copy link
Contributor Author

@mikesperber mikesperber commented Jan 8, 2020

Many thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.