hunspellDicts.ro-ro: init at 3.3.10 #313374

Andy3153 · 2024-05-21T11:24:11Z

Description of changes

Looking at other dictionary packages in the file I modified and at the PKGBUILD of the Arch Linux version of basically the same package (just to see where to get the dictionary from), I created a package that ships a Romanian dictionary for Hunspell.

Closes #315849

Things done

Add a 👍 reaction to pull requests you find important.

Aleksanaa

Please follow https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#commit-conventions.

Aleksanaa · 2024-05-21T12:34:43Z

I've updated the title, and you can update commit message yourself.

Andy3153 · 2024-05-21T15:14:50Z

I've updated the title, and you can update commit message yourself.

Currently trying to do that with no success, I was trying to follow this to no avail.

Any advice?

Aleksanaa · 2024-05-21T15:17:32Z

See https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/changing-a-commit-message

Also if you are using lazygit: press "r" on your commit and edit it right away.

Andy3153 · 2024-05-21T15:25:34Z

Done. So I was just not brave enough to use any sort of --force flag on git push.

Also, when will this be in nixpkgs-unstable? Meaning, when can I stop using my nixpkgs fork for this package?

Andy3153 · 2024-05-23T23:16:02Z

@Aleksanaa can this be merged now?

heisfer · 2024-05-29T22:27:36Z

pkgs/development/libraries/hunspell/dictionaries.nix

+      unzip $src ${dictFileName}.aff ${dictFileName}.dic ${readmeFile} -d ${dictFileName}
+    '';
+
+    meta = with lib; {


Remove with lib it's antipattern. #208242
You also use with lib.licenses below so it make it even more redundant.

Sorry. I was unsure of the code principles, I just followed a couple of other dictionaries I saw in that file. I'll make my code work without it if is needed.

Done: 64fc53a

heisfer · 2024-05-29T22:32:16Z

pkgs/development/libraries/hunspell/dictionaries.nix

+      description = "Hunspell dictionary for ${shortDescription} from rospell";
+      homepage = "https://sourceforge.net/projects/rospell/";
+      license = with lib.licenses; [ gpl2 lgpl21 mpl11 ];
+      #maintainers = with maintainers; [ Andy3153 ];


You could also remove this line if you don't plan to add yourself as maintainer.

I added that at first but then commented it out because I was unsure whether maintainers means package maintainers (me in this case) or maintainer of the program (where my package downloads from). If it means the first one, I'll uncomment that line.

First one. You need to add yourself to maintainers list if you already haven't in order to add yourself as package maintainer. I recommend creating separate PR for this

Done: b6c993a and #315849

kirillrdy · 2024-05-30T12:20:10Z

@Andy3153 greetings,

can you change commit order?

maintainers: add Andy3153 needs to happen before you use that attribute

Andy3153 · 2024-05-30T12:34:57Z

@kirillrdy Greetings, should be in the correct order now

kirillrdy · 2024-05-30T12:42:17Z

@Andy3153 sorry it may seem annoying at first, but nixpkgs is trying to maintain atomic commits, this is very useful for automatic git bisects.

because of this first commit violates CI meta check https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#meta-attributes . meta.maintainers must be set

so i would ask you to squash 1st and 3rd commits, then adding yourself to maintainers list needs to happen first. as for lib removal than can be separate commit or it can be squashed with init commit

appreciate your cooperation

Andy3153 · 2024-05-30T13:03:50Z

@kirillrdy Here you go. Squashed init, maintainer and removal of with lib into one and put adding maintainer first

eclairevoyant

Thanks for the contribution; couple points of feedback:

eclairevoyant · 2024-05-30T20:23:49Z

pkgs/development/libraries/hunspell/dictionaries.nix

+    meta = {
+      description = "Hunspell dictionary for ${shortDescription} from rospell";
+      homepage = "https://sourceforge.net/projects/rospell/";
+      license = with lib.licenses; [ gpl2 lgpl21 mpl11 ];


gpl2 identifier is deprecated, should be gpl2Only or gpl2Plus in accordance with upstream

just noticed, same for lgpl21

eclairevoyant · 2024-05-30T20:24:24Z

pkgs/development/libraries/hunspell/dictionaries.nix

+
+    src = fetchurl {
+      url = "https://downloads.sourceforge.net/rospell/${fileName}";
+      sha256 = "7f128d64ea06c9e6711c30b118c0afeefb014d8f33c92daccdf455aba2d04519";


Suggested change

sha256 = "7f128d64ea06c9e6711c30b118c0afeefb014d8f33c92daccdf455aba2d04519";

hash = "sha256-fxKNZOoGyeZxHDCxGMCv7vsBTY8zyS2szfRVq6LQRRk=";

SRI hash is preferred

I'm a little busy but I'll solve these two complaints soon

Currently having trouble with the SRI hash. How do I generate one more exactly? Just replacing the hash in there with what I get from sha256sum does not work.

Set it to empty string, rebuild, get the hash from that error. Never use sha256sum here.

Done. Anything else needed? Or any squashes? I got the commit history a bit long

heisfer · 2024-06-05T21:57:45Z

Rebase (squash) those following commits into one commit:

hunspellDicts.ro-ro: init at 3.3.10 (pick)
hunspellDicts.ro-ro: fixed license (squash)
hunspellDicts.ro-ro: using the hash attribute (squash)
hunspellDicts.ro-ro: fixed SRI hash (squash)
Nixpkgs uses atomic commits for ease of troubleshooting and using old packages.

And for merge conflict, don't merge master to branch, use rebase instead. (copied from another PR):

git checkout master
git reset --hard
git pull
git checkout hunspell-ro_RO
git rebase master
fix the conflict(s)
git push --force-with-lease

add a Romanian dictionary for Hunspell from rospell on Sourceforge

Andy3153 · 2024-06-05T23:04:49Z

@heisfer I think I've done everything right, should be done

heisfer · 2024-06-05T23:10:50Z

Seems okay (on the surface)

kirillrdy

Result of nixpkgs-review pr 313374 run on x86_64-linux 1

5 packages built:

hunspellDicts.ro-ro (hunspellDicts.ro_RO)
rstudio
rstudio-server
rstudioServerWrapper
rstudioWrapper

kirillrdy · 2024-06-06T20:22:42Z

Thank you !

NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label May 21, 2024

ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels May 21, 2024

Aleksanaa changed the title ~~add Romanian dictionary for hunspell~~ hunspellDicts.ro-ro: init at 3.3.10 May 21, 2024

Aleksanaa reviewed May 21, 2024

View reviewed changes

Andy3153 force-pushed the hunspell-ro_RO branch from d462981 to 7f7d346 Compare May 21, 2024 15:23

heisfer reviewed May 29, 2024

View reviewed changes

github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label May 30, 2024

Andy3153 force-pushed the hunspell-ro_RO branch from 307eb1a to 5991749 Compare May 30, 2024 12:33

ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label May 30, 2024

kirillrdy mentioned this pull request May 30, 2024

maintainers: add Andy3153 #315849

Closed

13 tasks

Andy3153 force-pushed the hunspell-ro_RO branch from 5991749 to 9145092 Compare May 30, 2024 13:02

heisfer approved these changes May 30, 2024

View reviewed changes

eclairevoyant reviewed May 30, 2024

View reviewed changes

wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels May 31, 2024

ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Jun 5, 2024

Andy3153 force-pushed the hunspell-ro_RO branch from 03b92a6 to b4f6c52 Compare June 5, 2024 22:55

Andy3153 added 2 commits June 6, 2024 02:02

maintainers: add Andy3153

db426fa

hunspellDicts.ro-ro: init at 3.3.10

923ea87

add a Romanian dictionary for Hunspell from rospell on Sourceforge

Andy3153 force-pushed the hunspell-ro_RO branch from b4f6c52 to 923ea87 Compare June 5, 2024 23:03

kirillrdy approved these changes Jun 6, 2024

View reviewed changes

kirillrdy merged commit 4761491 into NixOS:master Jun 6, 2024
25 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hunspellDicts.ro-ro: init at 3.3.10 #313374

hunspellDicts.ro-ro: init at 3.3.10 #313374

Andy3153 commented May 21, 2024 •

edited by eclairevoyant

Loading

Aleksanaa left a comment

Aleksanaa commented May 21, 2024

Andy3153 commented May 21, 2024

Aleksanaa commented May 21, 2024

Andy3153 commented May 21, 2024

Andy3153 commented May 23, 2024

heisfer May 29, 2024

Andy3153 May 29, 2024

Andy3153 May 30, 2024

heisfer May 29, 2024

Andy3153 May 29, 2024

heisfer May 30, 2024 •

edited

Loading

Andy3153 May 30, 2024 •

edited

Loading

kirillrdy commented May 30, 2024

Andy3153 commented May 30, 2024

kirillrdy commented May 30, 2024

Andy3153 commented May 30, 2024

eclairevoyant left a comment

eclairevoyant May 30, 2024

eclairevoyant May 31, 2024

eclairevoyant May 30, 2024

Andy3153 May 31, 2024

Andy3153 Jun 5, 2024

eclairevoyant Jun 5, 2024 •

edited

Loading

Andy3153 Jun 5, 2024

heisfer commented Jun 5, 2024 •

edited

Loading

Andy3153 commented Jun 5, 2024

heisfer commented Jun 5, 2024

kirillrdy left a comment

kirillrdy commented Jun 6, 2024

	sha256 = "7f128d64ea06c9e6711c30b118c0afeefb014d8f33c92daccdf455aba2d04519";
	hash = "sha256-fxKNZOoGyeZxHDCxGMCv7vsBTY8zyS2szfRVq6LQRRk=";

hunspellDicts.ro-ro: init at 3.3.10 #313374

hunspellDicts.ro-ro: init at 3.3.10 #313374

Conversation

Andy3153 commented May 21, 2024 • edited by eclairevoyant Loading

Description of changes

Things done

Aleksanaa left a comment

Choose a reason for hiding this comment

Aleksanaa commented May 21, 2024

Andy3153 commented May 21, 2024

Aleksanaa commented May 21, 2024

Andy3153 commented May 21, 2024

Andy3153 commented May 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heisfer May 30, 2024 • edited Loading

Choose a reason for hiding this comment

Andy3153 May 30, 2024 • edited Loading

Choose a reason for hiding this comment

kirillrdy commented May 30, 2024

Andy3153 commented May 30, 2024

kirillrdy commented May 30, 2024

Andy3153 commented May 30, 2024

eclairevoyant left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eclairevoyant Jun 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

heisfer commented Jun 5, 2024 • edited Loading

Andy3153 commented Jun 5, 2024

heisfer commented Jun 5, 2024

kirillrdy left a comment

Choose a reason for hiding this comment

kirillrdy commented Jun 6, 2024

Andy3153 commented May 21, 2024 •

edited by eclairevoyant

Loading

heisfer May 30, 2024 •

edited

Loading

Andy3153 May 30, 2024 •

edited

Loading

eclairevoyant Jun 5, 2024 •

edited

Loading

heisfer commented Jun 5, 2024 •

edited

Loading