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

gucharmap: 3.18.2 -> 10.0.1 #29885

Merged
merged 1 commit into from Sep 29, 2017
Merged

gucharmap: 3.18.2 -> 10.0.1 #29885

merged 1 commit into from Sep 29, 2017

Conversation

xzfc
Copy link
Contributor

@xzfc xzfc commented Sep 28, 2017

Motivation for this change

Update to the latest version.

  • Gucharmap no longer follow the GNOME major versioning.
  • Gucharmap no longer includes Unicode data. Instead the data should be downloaded from unicode.org.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@@ -1,6 +1,7 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3
, glib, desktop_file_utils, bash, appdata-tools
, makeWrapper, gnome3, file, itstool, libxml2 }:
, wrapGAppsHook, gnome3, file, itstool, libxml2
Copy link
Contributor

@jtojnar jtojnar Sep 28, 2017

Choose a reason for hiding this comment

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

file is no longer used. Otherwise, it looks good to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed file.

- Gucharmap no longer follow the GNOME major versioning.
- Gucharmap no longer includes Unicode data. Instead the data should be
  downloaded from unicode.org.
@@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment is obsolete.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No.
It is still generated by ./maintainers/scripts/gnome.sh update gucharmap.
Having gucharmap in NO_GNOME_MAJOR means that this package is not updated with the rest of GNOME by calling ./maintainers/scripts/gnome.sh update-all.

gnome3.yelp_tools libxml2 desktop_file_utils
gnome3.gsettings_desktop_schemas ];

unicode-data = callPackage ./unicode-data.nix {};
Copy link
Contributor

Choose a reason for hiding this comment

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

This package seems useful outside gucharmap. For example, https://github.com/NixOS/nixpkgs/blob/26033a43/pkgs/tools/misc/unicode/default.nix could use it. However, I don't mind if it remains private for now.

Copy link
Contributor Author

@xzfc xzfc Sep 29, 2017

Choose a reason for hiding this comment

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

Yea.
However, I'm not sure which files it should contain (different apps may require different ucd files), and should it be zipped or not.
For example, gucharmap requires Unihan.zip to be zipped, but the contents of UCD.zip (Blocks.txt, UnicodeData.txt, ...) should be not.

Copy link
Contributor

Choose a reason for hiding this comment

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

Arch package might be used as an inspiration: https://www.archlinux.org/packages/extra/any/unicode-character-database/.

@orivej
Copy link
Contributor

orivej commented Sep 29, 2017

Thank you for the clarifications.

@orivej orivej merged commit 2f522ce into NixOS:master Sep 29, 2017
@xzfc xzfc mentioned this pull request Sep 30, 2017
8 tasks
@xzfc xzfc deleted the gucharmap branch January 4, 2019 08:45
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.

None yet

4 participants