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.

Sign up for GitHub

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

Jump to bottom

desktop-file-utils: use patch for font media type #50493

Merged
merged 1 commit into from Nov 17, 2018
Merged

desktop-file-utils: use patch for font media type #50493

merged 1 commit into from Nov 17, 2018

Conversation

michaelpj
Copy link
Contributor

Upstream seems to release very slowly - this commit has been in for some
time, but they haven't cut a new release.

Fixes #50402.

@matthewbauer

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@michaelpj
desktop-file-utils: use patch for font media type
a953f01 
Upstream seems to release very slowly - this commit has been in for some
time, but they haven't cut a new release.

Fixes NixOS#50402.
@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 17, 2018

@GrahamcOfBorg build desktop-file-utils

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: desktop-file-utils

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23
shrinking /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23/bin/update-desktop-database
shrinking /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23/bin/desktop-file-install
/nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23
shrinking /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23/bin/desktop-file-validate
gzipping man pages under /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23/bin
patching script interpreter paths in /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23
checking for references to /build in /nix/store/rvpir6iapyrvby0a0k92rhf19h887pr5-desktop-file-utils-0.23...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: desktop-file-utils

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23
shrinking /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23/bin/desktop-file-validate
shrinking /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23/bin/update-desktop-database
shrinking /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23/bin/desktop-file-install
gzipping man pages under /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23/bin
patching script interpreter paths in /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23
checking for references to /build in /nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23...
/nix/store/yvsy1qp0p73pcna0qijgc8anjdqghqm2-desktop-file-utils-0.23

timokau
timokau approved these changes Nov 17, 2018
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Patch already accepted upstream, good comment explaining the reasoning. Looks good to me, thank you for fixing this :)

Last release was a year ago, that really seems a bit long.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 17, 2018

@GrahamcOfBorg build gnome3.gnome-font-viewer

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gnome3.gnome-font-viewer

Partial log (click to expand)

  /nix/store/9bn4mzica3nmbrxn31xidvylbhzkgyv1-gnome-desktop-3.28.2
  /nix/store/smwmnv33yb67b1qldxgdr63dayp25v3k-iso-codes-3.79
  /nix/store/wj4cym25d555kp4fvwcszqs8k6z01zvh-hicolor-icon-theme-0.17
  /nix/store/zmc3ysyvpq04x1vg6zgccglq201z7w30-adwaita-icon-theme-3.30.0
copying path '/nix/store/wj4cym25d555kp4fvwcszqs8k6z01zvh-hicolor-icon-theme-0.17' from 'https://cache.nixos.org'...
copying path '/nix/store/smwmnv33yb67b1qldxgdr63dayp25v3k-iso-codes-3.79' from 'https://cache.nixos.org'...
copying path '/nix/store/zmc3ysyvpq04x1vg6zgccglq201z7w30-adwaita-icon-theme-3.30.0' from 'https://cache.nixos.org'...
copying path '/nix/store/9bn4mzica3nmbrxn31xidvylbhzkgyv1-gnome-desktop-3.28.2' from 'https://cache.nixos.org'...
copying path '/nix/store/6nkyx61g4h0v5dhgyhsmd1invd19dq19-gnome-font-viewer-3.30.0' from 'https://cache.nixos.org'...
/nix/store/6nkyx61g4h0v5dhgyhsmd1invd19dq19-gnome-font-viewer-3.30.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gnome3.gnome-font-viewer

Partial log (click to expand)

these paths will be fetched (0.11 MiB download, 0.75 MiB unpacked):
  /nix/store/y3xm72aimkld6dmz9si0q0b8517d3r31-gnome-font-viewer-3.30.0
copying path '/nix/store/y3xm72aimkld6dmz9si0q0b8517d3r31-gnome-font-viewer-3.30.0' from 'https://cache.nixos.org'...
/nix/store/y3xm72aimkld6dmz9si0q0b8517d3r31-gnome-font-viewer-3.30.0

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 17, 2018 •
edited

>;< wrong test

@GrahamcOfBorg build zathura-core

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: zathura-core

Partial log (click to expand)

Cannot nix-instantiate `zathura-core' because:
error: attribute 'zathura-core' in selection path 'zathura-core' not found

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: zathura-core

Partial log (click to expand)

Cannot nix-instantiate `zathura-core' because:
error: attribute 'zathura-core' in selection path 'zathura-core' not found

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 17, 2018

@GrahamcOfBorg build zathura

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: zathura-core

Partial log (click to expand)

Cannot nix-instantiate `zathura-core' because:
error: attribute 'zathura-core' in selection path 'zathura-core' not found

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: zathura-core

Partial log (click to expand)

Cannot nix-instantiate `zathura-core' because:
error: attribute 'zathura-core' in selection path 'zathura-core' not found

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: zathura

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/74v3vinbhpgmpsxgpr6fj8xclhi81014-zathura-ps-0.2.6
shrinking /nix/store/74v3vinbhpgmpsxgpr6fj8xclhi81014-zathura-ps-0.2.6/lib/zathura/libps.so
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/74v3vinbhpgmpsxgpr6fj8xclhi81014-zathura-ps-0.2.6/lib
patching script interpreter paths in /nix/store/74v3vinbhpgmpsxgpr6fj8xclhi81014-zathura-ps-0.2.6
checking for references to /build in /nix/store/74v3vinbhpgmpsxgpr6fj8xclhi81014-zathura-ps-0.2.6...
building '/nix/store/aq8x35x684xjjxifyshgccwcqrbii02z-zathura-with-plugins-0.4.1.drv'...
/nix/store/zm86a982zp9rn81sf35x0m1kyw5nyxn9-zathura-with-plugins-0.4.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: zathura

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/vwcii22c2pmk0vvmyw8nabbar2p7n8wv-zathura-pdf-mupdf-0.3.4
shrinking /nix/store/vwcii22c2pmk0vvmyw8nabbar2p7n8wv-zathura-pdf-mupdf-0.3.4/lib/zathura/libpdf-mupdf.so
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vwcii22c2pmk0vvmyw8nabbar2p7n8wv-zathura-pdf-mupdf-0.3.4/lib
patching script interpreter paths in /nix/store/vwcii22c2pmk0vvmyw8nabbar2p7n8wv-zathura-pdf-mupdf-0.3.4
checking for references to /build in /nix/store/vwcii22c2pmk0vvmyw8nabbar2p7n8wv-zathura-pdf-mupdf-0.3.4...
building '/nix/store/ixmav1jcxh2h20h54fyljkp1cy4mvkqs-zathura-with-plugins-0.4.1.drv'...
/nix/store/5qgxxqnnpfxprimf4yvg2s9n2wrz84h8-zathura-with-plugins-0.4.1

@c0bw3b c0bw3b merged commit 93b6863 into NixOS:master Nov 17, 2018
@worldofpeace worldofpeace mentioned this pull request Nov 18, 2018
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau approved these changes

@c0bw3b c0bw3b c0bw3b approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@michaelpj @c0bw3b @GrahamcOfBorg @timokau