WIP: gettext: refactor and split in multiple packages #79171

lsix · 2020-02-03T18:15:38Z

Motivation for this change

This PR solves #73288

Following upstream recommendations, gettext is split into 3 distinct
packages:

gettext-runtime
gettext-tools
libtextstyle

See https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blob;f=PACKAGING;h=f4bae4561ec70a9de2532502b5c2358bb976036c;hb=55b8fe9a2f12b22eb3ee6baf973e03e60b3a9915

Given that for each sub-package we use sourceRoot, the patches do not
apply directly when fetch from upstream git and have to be editted to
strip the top level dir.

For the time being, gettext is turned into an alias to
gettext-runtime to ease transition.

A tree-wide update could be tried to replace all occurances of a gettext dependency with gettext-runtime if required by review.

I am also very open to discussions on how I did implement the 3 packages that share 1 source tarball.

If we are too close to the last staging changes before release-20.03, I have no problem to postpone this MR (cc @FRidh ).

Things done

nixos/doc/manual/release-notes/rl-2003.xml

pkgs/development/libraries/gettext-runtime/default.nix

pkgs/development/tools/gettext-tools/default.nix

lsix · 2020-02-06T08:50:24Z

@jtojnar thanks for the review

I am so ashamed of the number of of typos I did let through…

I am rebuilding everything to test at the moment. I’ll push when I have checked that it builds properly.

I have also ported some modifications you suggested from gettext-tools to gettext-runtime (like drop trying to drop CFLAGS=-D_FORTIFY_SOURCE=0 for darwin). hydra will let us know if this is a mistake. If necessary it will be easily to reintroduce.

nixos/doc/manual/release-notes/rl-2003.xml

jtojnar · 2020-02-10T19:53:12Z

nixos/doc/manual/release-notes/rl-2003.xml

+     The <package>gettext</package> has been split into 3 components:
+     <package>gettext-runtime</package>, <package>gettext-tools</package>
+     and <package>libtextstyle</package>. As a convenience, <package>gettext</package>
+     now points to <package>gettext-runtime</package>.


Suggested change

now points to <package>gettext-runtime</package>.

now points to <package>gettext</package>.

jtojnar · 2020-02-10T19:53:26Z

pkgs/development/libraries/flatpak/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  patches = [
    (substituteAll {
      src = ./fix-test-paths.patch;
-      inherit coreutils gettext glibcLocales;
+      inherit coreutils gettext-tools glibcLocales;


Suggested change

inherit coreutils gettext-tools glibcLocales;

inherit coreutils glibcLocales;

gettext = gettext-tools;

Bash does not support dashes in variable names.

jtojnar · 2020-02-10T19:54:33Z

pkgs/development/libraries/flatpak/fix-test-paths.patch

@@ -35,14 +35,14 @@ index 0a0a28f1..16fd51fe 100755
 EOF
 mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
 -msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
-+@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
+@gettext-tools@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po


Suggested change

+@gettext-tools@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po

+@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po

jtojnar · 2020-02-10T19:54:40Z

pkgs/development/libraries/flatpak/fix-test-paths.patch

 cat > fr.po <<EOF
 msgid "Hello world"
 msgstr "Bonjour le monde"
 EOF
 mkdir -p ${DIR}/files/fr/share/fr/LC_MESSAGES
 -msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
-+@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
+@gettext-tools@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po


Suggested change

+@gettext-tools@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po

+@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po

jtojnar · 2020-02-10T19:57:18Z

pkgs/development/libraries/glib/default.nix

@@ -105,10 +105,10 @@ stdenv.mkDerivation rec {
  ]);

  nativeBuildInputs = [
-    meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
+    meson ninja pkgconfig perl python3 gettext-tools gtk-doc docbook_xsl docbook_xml_dtd_45


Could you make all the alias fixes into a separate commit so it is easier to review?

jtojnar · 2020-02-10T19:58:32Z

pkgs/top-level/all-packages.nix

+  libtextstyle = callPackage ../development/libraries/libtextstyle { };
+
+  # Ease transition between one-package gettext to split packages (tools - runtime)
+  gettext = gettext-runtime;


This is the most common use case.

Suggested change

gettext = gettext-runtime;

gettext = gettext-tools;

jtojnar · 2020-02-10T20:14:20Z

I would actually suggest going with gettext = gettext-tools; and letting Hydra tell us what is broken. And then based on that add the runtime where needed. And finally resolve the alias everywhere.

Following upstream recommendations, gettext is split into 3 distinct packages: - gettext-runtime - gettext-tools - libtextstyle See https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blob;f=PACKAGING;h=f4bae4561ec70a9de2532502b5c2358bb976036c;hb=55b8fe9a2f12b22eb3ee6baf973e03e60b3a9915 Given that for each sub-package we use `sourceRoot`, the patches do not apply directly when fetch from upstream git and have to be editted to strip the top level dir. For the time being, `gettext` is turned into an alias to `gettext-runtime` to ease transition.

lsix · 2020-02-13T21:13:24Z

@jtojnar I am a but busy at the moment, I’ll come back to this MR probably next week and try to make progress on it.

Thanks for your feedbacks, they are really valuable!

stale · 2020-08-11T22:53:02Z

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

infinisil · 2020-08-24T01:54:27Z

Still interested in this @lsix and @jtojnar?

jtojnar · 2020-08-24T02:22:08Z

Yes, we definitely still want this but I do not think I will be able to finish this for 20.09.

lsix · 2020-08-24T07:44:06Z

Yes, we still want this, but I have not had much time nor build resources to dedicate to it 😭

stale · 2021-11-09T19:20:14Z

I marked this as stale due to inactivity. → More info

FRidh added this to WIP in Staging via automation Feb 3, 2020

FRidh added this to the 20.03 milestone Feb 3, 2020

FRidh moved this from WIP to Needs review in Staging Feb 3, 2020

ofborg bot added 6.topic: nixos 8.has: changelog 8.has: documentation labels Feb 3, 2020

lsix force-pushed the refactor-gettext-0.20.1 branch 2 times, most recently from 0ef0cd9 to 0b070e2 Compare February 3, 2020 20:01

ofborg bot added 10.rebuild-darwin-stdenv 10.rebuild-linux-stdenv 8.has: package (new) labels Feb 3, 2020

ofborg bot requested review from lovek323, andir, np, vrthra, edolstra and zimbatm February 3, 2020 21:02

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Feb 3, 2020

disassembler modified the milestones: 20.03, 20.09 Feb 5, 2020

jtojnar requested changes Feb 5, 2020

View reviewed changes

lsix force-pushed the refactor-gettext-0.20.1 branch 2 times, most recently from f64049c to ddea13a Compare February 6, 2020 09:51

lsix requested a review from jtojnar February 6, 2020 10:26

jtojnar reviewed Feb 6, 2020

View reviewed changes

nixos/doc/manual/release-notes/rl-2003.xml Outdated Show resolved Hide resolved

lsix force-pushed the refactor-gettext-0.20.1 branch from ddea13a to 9af153e Compare February 6, 2020 16:19

lsix force-pushed the refactor-gettext-0.20.1 branch from 45bcd7f to a3233b2 Compare February 10, 2020 12:42

ofborg bot requested a review from 7c6f434c February 10, 2020 13:03

lsix force-pushed the refactor-gettext-0.20.1 branch 2 times, most recently from 04e0ae9 to f764d7a Compare February 10, 2020 19:55

jtojnar reviewed Feb 10, 2020

View reviewed changes

lsix force-pushed the refactor-gettext-0.20.1 branch from f764d7a to 24e7a13 Compare February 10, 2020 20:03

lsix force-pushed the refactor-gettext-0.20.1 branch from 24e7a13 to 429f08e Compare February 10, 2020 23:28

lsix force-pushed the refactor-gettext-0.20.1 branch from 429f08e to 539417b Compare February 10, 2020 23:42

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 11, 2020

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 24, 2020

FRidh modified the milestones: 20.09, 21.03 Aug 24, 2020

ryantm added the 2.status: merge conflict label Oct 3, 2020

ryantm marked this pull request as draft October 23, 2020 03:02

jtojnar modified the milestones: 21.05, 21.11 May 11, 2021

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 9, 2021

Artturin modified the milestones: 21.11, 23.05 Dec 31, 2022

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Dec 31, 2022

Artturin removed this from the 23.05 milestone Jan 9, 2023

wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: gettext: refactor and split in multiple packages #79171

WIP: gettext: refactor and split in multiple packages #79171

lsix commented Feb 3, 2020

lsix commented Feb 6, 2020

jtojnar Feb 10, 2020

jtojnar Feb 10, 2020

jtojnar Feb 10, 2020

jtojnar Feb 10, 2020

jtojnar Feb 10, 2020

jtojnar Feb 10, 2020

jtojnar Feb 10, 2020

jtojnar commented Feb 10, 2020 •

edited

lsix commented Feb 13, 2020

stale bot commented Aug 11, 2020

infinisil commented Aug 24, 2020

jtojnar commented Aug 24, 2020

lsix commented Aug 24, 2020

stale bot commented Nov 9, 2021

	now points to <package>gettext-runtime</package>.
	now points to <package>gettext</package>.

	inherit coreutils gettext-tools glibcLocales;
	inherit coreutils glibcLocales;
	gettext = gettext-tools;

	+@gettext-tools@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
	+@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po

WIP: gettext: refactor and split in multiple packages #79171

Are you sure you want to change the base?

WIP: gettext: refactor and split in multiple packages #79171

Conversation

lsix commented Feb 3, 2020

Motivation for this change

Things done

lsix commented Feb 6, 2020

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar Feb 10, 2020

Choose a reason for hiding this comment

jtojnar commented Feb 10, 2020 • edited

lsix commented Feb 13, 2020

stale bot commented Aug 11, 2020

infinisil commented Aug 24, 2020

jtojnar commented Aug 24, 2020

lsix commented Aug 24, 2020

stale bot commented Nov 9, 2021

jtojnar commented Feb 10, 2020 •

edited