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

Jump to bottom

ispell: fix hash and drop patches #79025

Merged
merged 1 commit into from Aug 5, 2021
Merged

ispell: fix hash and drop patches #79025

merged 1 commit into from Aug 5, 2021

Conversation

tadeokondrak
Copy link
Member

Motivation for this change

#64285 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lheckemann
Copy link
Member

If we're not applying the patches anymore, we should probably also remove them from nixpkgs.

worldofpeace
worldofpeace suggested changes Feb 1, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

See @lheckemann comment

jtojnar
jtojnar reviewed Feb 2, 2020
View reviewed changes
pkgs/tools/text/ispell/default.nix
./patches/0023-Exclusive-options.patch
./patches/0024-Check-tempdir-creation.patch
./patches/0025-Languages.patch
./patches/0030-Display-whole-multibyte-character.patch
Copy link
Contributor

Choose a reason for hiding this comment

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

Some of these still might make sense when updated from https://salsa.debian.org/debian/ispell/tree/debian/3.4.00-8/debian/patches. Why they did not upstream them even after all these years is beyond me.

Or if this is intended only for the German dictionary we might make it local as originally suggested.

Or maybe we are fine with vanilla ispell, even though some of those patches look like they should definitely be upstreamed.

@Ekleog
Copy link
Member

Ekleog commented Jun 11, 2020

I'd vote for just landing this, up-to-date vanilla ispell probably is better matching the nixos way of doing things than debian-old ispell.

@jtojnar What do you think about merging this as is?

@jtojnar
Copy link
Contributor

jtojnar commented Jun 12, 2020 •
edited

I would definitely prefer vanilla package but would like still hear from @timor or @bennofs why they included these patches.

@GrahamcOfBorg build hunspellDicts.de-de hunspellDicts.de-ch hunspellDicts.de-at

@timor
Copy link
Member

timor commented Jun 12, 2020

I cannot comment on these patches, sorry. I merely re-used @bennofs' code (for the sole purpose of building the German hunspell dictionaries).

@stale
Copy link

stale bot commented Dec 9, 2020

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

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Dec 9, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 18, 2021
@tadeokondrak
ispell: fix hash and drop patches
02fe8cb 
This was added only to build hunspellDicts.de_DE: [1]
The patches came from an older PR (taken from Debian): [2]
but aren't needed to build the dictionary.

[1]: NixOS#36155
[2]: NixOS#3320
@veprbl
Copy link
Member

veprbl commented Aug 3, 2021

Result of nixpkgs-review pr 79025 run on x86_64-darwin 1

4 packages built:
  • hunspellDicts.de-at (hunspellDicts.de_AT)
  • hunspellDicts.de-ch (hunspellDicts.de_CH)
  • hunspellDicts.de-de (hunspellDicts.de_DE)
  • ispell

@veprbl veprbl merged commit a8317b2 into NixOS:master Aug 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@worldofpeace worldofpeace worldofpeace requested changes

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

Successfully merging this pull request may close these issues.

None yet
8 participants
@tadeokondrak @lheckemann @Ekleog @jtojnar @timor @veprbl @worldofpeace @SuperSandro2000