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

inkscape: 1.3.2 -> 1.4 #351517

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

inkscape: 1.3.2 -> 1.4 #351517

wants to merge 4 commits into from

Conversation

x123
Copy link
Contributor

@x123 x123 commented Oct 26, 2024

Things done

  • light refactor of meta
  • add x123 as maintainer
  • update inkscape from 1.3.2 -> 1.4
  • update inkex patches and deps
  • mark svg2tikz as broken due to upstream not handling inkscape/inkex 1.4

NOTE: nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD" had broken deps related to svg2tikz. This appears to be an upstream issue with svg2tikz in that the code references functions that are no longer available in 1.4 (or are otherwise renamed). I'm not sure what the best practice is here, but I feel it would be a bit silly to hold back some major improvements brought by 1.4 over a single extension. I've marked svg2tikz as broken and will create an issue for it.

I've tested the binary on x86_64-linux and on aarch64-darwin and the program appears to function as it should.


The results from nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD" (after marking svg2tikz as broken):

┏━ Dependency Graph:
┃ ✔ review-shell
┣━━━ Builds
┗━ ∑ ⏵ 0 │ ✔ 1 │ ⏸ 0 │ Finished at 21:44:04 after 3s
--------- Report for 'x86_64-linux' ---------
8 packages marked as broken and skipped:
python311Packages.svg2tikz python311Packages.svg2tikz.dist python312Packages.svg2tikz python312Packages.svg2tikz.dist spring springLobby svg2tikz svg2tikz.dist

125 packages built:
adapta-gtk-theme arc-theme arx-libertatis asciidoc-full asciidoc-full-with-plugins asciidoc-full-with-plugins.dist asciidoc-full.dist ayu-theme-gtk breeze-hacked-cursor-theme capitaine-cursors catppuccin-cursors catppuccin-cursors.frappeBlue catppuccin-cursors.frappeDark catppuccin-cursors.frappeFlamingo catppuccin-cursors.frappeGreen catppuccin-cursors.frappeLavender catppuccin-cursors.frappeLight catppuccin-cursors.frappeMaroon catppuccin-cursors.frappeMauve catppuccin-cursors.frappePeach catppuccin-cursors.frappePink catppuccin-cursors.frappeRed catppuccin-cursors.frappeRosewater catppuccin-cursors.frappeSapphire catppuccin-cursors.frappeSky catppuccin-cursors.frappeTeal catppuccin-cursors.frappeYellow catppuccin-cursors.latteBlue catppuccin-cursors.latteDark catppuccin-cursors.latteFlamingo catppuccin-cursors.latteGreen catppuccin-cursors.latteLavender catppuccin-cursors.latteLight catppuccin-cursors.latteMaroon catppuccin-cursors.latteMauve catppuccin-cursors.lattePeach catppuccin-cursors.lattePink catppuccin-cursors.latteRed catppuccin-cursors.latteRosewater catppuccin-cursors.latteSapphire catppuccin-cursors.latteSky catppuccin-cursors.latteTeal catppuccin-cursors.latteYellow catppuccin-cursors.macchiatoBlue catppuccin-cursors.macchiatoDark catppuccin-cursors.macchiatoFlamingo catppuccin-cursors.macchiatoGreen catppuccin-cursors.macchiatoLavender catppuccin-cursors.macchiatoLight catppuccin-cursors.macchiatoMaroon catppuccin-cursors.macchiatoMauve catppuccin-cursors.macchiatoPeach catppuccin-cursors.macchiatoPink catppuccin-cursors.macchiatoRed catppuccin-cursors.macchiatoRosewater catppuccin-cursors.macchiatoSapphire catppuccin-cursors.macchiatoSky catppuccin-cursors.macchiatoTeal catppuccin-cursors.macchiatoYellow catppuccin-cursors.mochaBlue catppuccin-cursors.mochaDark catppuccin-cursors.mochaFlamingo catppuccin-cursors.mochaGreen catppuccin-cursors.mochaLavender catppuccin-cursors.mochaLight catppuccin-cursors.mochaMaroon catppuccin-cursors.mochaMauve catppuccin-cursors.mochaPeach catppuccin-cursors.mochaPink catppuccin-cursors.mochaRed catppuccin-cursors.mochaRosewater catppuccin-cursors.mochaSapphire catppuccin-cursors.mochaSky catppuccin-cursors.mochaTeal catppuccin-cursors.mochaYellow cinnamon-screensaver clevis clevis.man coreboot-configurator dblatexFull diagrams-as-code diagrams-as-code.dist disorderfs emojione fim find-billy hackneyed hikounomizu inkscape inkscape-extensions.applytransforms inkscape-extensions.silhouette inkscape-extensions.silhouette.dist inkscape-extensions.textext inkscape-extensions.textext.dist inkscape-with-extensions iso-flags iso-flags-png-320x240 k40-whisperer kakounePlugins.rep luksmeta mate.mate-panel-with-applets mate.mate-utils material-cursors mojave-gtk-theme numix-cursor-theme numix-solarized-gtk-theme plata-theme pop-gtk-theme python311Packages.diagrams python311Packages.diagrams.dist python311Packages.inkex python311Packages.inkex.dist python311Packages.osc-diagram python311Packages.osc-diagram.dist python312Packages.diagrams python312Packages.diagrams.dist python312Packages.inkex python312Packages.inkex.dist python312Packages.osc-diagram python312Packages.osc-diagram.dist tang tang.man vimix-cursors volantes-cursors wpa_supplicant_gui

The results from nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD" (before marking svg2tikz as broken):

┏━ 2 Errors:

┃        >             return None
┃        > >       shape = inkex.properties.match_url_and_return_element(url, self.svg)
┃        > E       AttributeError: module 'inkex.properties' has no attribute 'match_url_and_return_e…
┃        >
┃        > svg2tikz/tikz_export.py:822: AttributeError
┃        > =========================== short test summary info ============================
┃        > FAILED tests/test_tikz_path_exporter.py::TestTikZPathExporter::test_get_text - AttributeEr…
┃        > FAILED tests/test_tikz_path_exporter.py::TestTikZPathExporter::test_handle_shape - Attribu…
┃        > =================== 2 failed, 64 passed, 1 skipped in 0.91s ====================
┃        For full logs, run 'nix log /nix/store/vyw4rxkxmynw7gnv7632wx62d395bmyc-python3.12-svg2tikz-…
┣━ Dependency Graph:
┃    ┌─ ✔ adapta-gtk-theme-3.95.0.11 ⏱ 3m12s
┃    ├─ ✔ vimix-cursors-2020-02-24-unstable-2021-09-18 ⏱ 3m18s
┃    ├─ ✔ capitaine-cursors-4 ⏱ 4m37s
┃    ├─ ✔ numix-solarized-gtk-theme-20230408 ⏱ 4m55s
┃    ├─ ✔ catppuccin-cursors-0.4.0 ⏱ 8m20s
┃    ├─ ⚠ python3.11-svg2tikz-3.2.0 failed with exit code 1 after ⏱ 3s in pytestCheckPhase
┃    ├─ ⚠ python3.12-svg2tikz-3.2.0 failed with exit code 1 after ⏱ 2s in pytestCheckPhase
┃ ┌─ ⏸ env
┃ ⏸ review-shell
┣━━━ Builds
┗━ ∑ ⏵ 0 │ ✔ 9 │ ⏸ 2 │ ⚠ Exited after 2 build failures at 21:35:26 after 8m24s
--------- Report for 'x86_64-linux' ---------
2 packages marked as broken and skipped:
spring springLobby

4 packages failed to build:
python311Packages.svg2tikz python311Packages.svg2tikz.dist svg2tikz svg2tikz.dist

125 packages built:
adapta-gtk-theme arc-theme arx-libertatis asciidoc-full asciidoc-full-with-plugins asciidoc-full-with-plugins.dist asciidoc-full.dist ayu-theme-gtk breeze-hacked-cursor-theme capitaine-cursors catppuccin-cursors catppuccin-cursors.frappeBlue catppuccin-cursors.frappeDark catppuccin-cursors.frappeFlamingo catppuccin-cursors.frappeGreen catppuccin-cursors.frappeLavender catppuccin-cursors.frappeLight catppuccin-cursors.frappeMaroon catppuccin-cursors.frappeMauve catppuccin-cursors.frappePeach catppuccin-cursors.frappePink catppuccin-cursors.frappeRed catppuccin-cursors.frappeRosewater catppuccin-cursors.frappeSapphire catppuccin-cursors.frappeSky catppuccin-cursors.frappeTeal catppuccin-cursors.frappeYellow catppuccin-cursors.latteBlue catppuccin-cursors.latteDark catppuccin-cursors.latteFlamingo catppuccin-cursors.latteGreen catppuccin-cursors.latteLavender catppuccin-cursors.latteLight catppuccin-cursors.latteMaroon catppuccin-cursors.latteMauve catppuccin-cursors.lattePeach catppuccin-cursors.lattePink catppuccin-cursors.latteRed catppuccin-cursors.latteRosewater catppuccin-cursors.latteSapphire catppuccin-cursors.latteSky catppuccin-cursors.latteTeal catppuccin-cursors.latteYellow catppuccin-cursors.macchiatoBlue catppuccin-cursors.macchiatoDark catppuccin-cursors.macchiatoFlamingo catppuccin-cursors.macchiatoGreen catppuccin-cursors.macchiatoLavender catppuccin-cursors.macchiatoLight catppuccin-cursors.macchiatoMaroon catppuccin-cursors.macchiatoMauve catppuccin-cursors.macchiatoPeach catppuccin-cursors.macchiatoPink catppuccin-cursors.macchiatoRed catppuccin-cursors.macchiatoRosewater catppuccin-cursors.macchiatoSapphire catppuccin-cursors.macchiatoSky catppuccin-cursors.macchiatoTeal catppuccin-cursors.macchiatoYellow catppuccin-cursors.mochaBlue catppuccin-cursors.mochaDark catppuccin-cursors.mochaFlamingo catppuccin-cursors.mochaGreen catppuccin-cursors.mochaLavender catppuccin-cursors.mochaLight catppuccin-cursors.mochaMaroon catppuccin-cursors.mochaMauve catppuccin-cursors.mochaPeach catppuccin-cursors.mochaPink catppuccin-cursors.mochaRed catppuccin-cursors.mochaRosewater catppuccin-cursors.mochaSapphire catppuccin-cursors.mochaSky catppuccin-cursors.mochaTeal catppuccin-cursors.mochaYellow cinnamon-screensaver clevis clevis.man coreboot-configurator dblatexFull diagrams-as-code diagrams-as-code.dist disorderfs emojione fim find-billy hackneyed hikounomizu inkscape inkscape-extensions.applytransforms inkscape-extensions.silhouette inkscape-extensions.silhouette.dist inkscape-extensions.textext inkscape-extensions.textext.dist inkscape-with-extensions iso-flags iso-flags-png-320x240 k40-whisperer kakounePlugins.rep luksmeta mate.mate-panel-with-applets mate.mate-utils material-cursors mojave-gtk-theme numix-cursor-theme numix-solarized-gtk-theme plata-theme pop-gtk-theme python311Packages.diagrams python311Packages.diagrams.dist python311Packages.inkex python311Packages.inkex.dist python311Packages.osc-diagram python311Packages.osc-diagram.dist python312Packages.diagrams python312Packages.diagrams.dist python312Packages.inkex python312Packages.inkex.dist python312Packages.osc-diagram python312Packages.osc-diagram.dist tang tang.man vimix-cursors volantes-cursors wpa_supplicant_gui

The error in upstream svg2tikz appears to be here:
https://github.com/xyz2tex/svg2tikz/blob/89d17219ac22d80570a8171bb1d4b01700787fba/svg2tikz/tikz_export.py#L822


  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@jtojnar
Copy link
Member

jtojnar commented Oct 27, 2024

Hi, thanks for the PR but we already have #348253

@jtojnar jtojnar mentioned this pull request Oct 27, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants