Commit Graph

42 Commits

Author SHA1 Message Date
Frederik Rietdijk
91f7042aa0 aspellWithDicts: use a single env
In c0cf19608faf447d4b78f77ff36a770462b19a22 the function
`aspellWithDicts` was introduced, that allows to build a derivation
consisting of aspell and specified dictionaries. In
96457d26dded05bcba8e9fbb9bf0255596654aab a fix was included to properly
find the dictionaries.

Issue #29429 describes that, while the current method works for the
aspell binary, it does not in case of the API.

This commit rewrites the wrapper into a single derivation, create a
single tree of symbolic references to both the binary and the
dictionaries so that its possible to find the dictionaries with the API.
Furthermore, the binary is wrapped so it can still find the dictionaries
as well.
2017-09-16 13:06:26 +02:00
Frederik Rietdijk
96457d26dd aspellWithDicts: fixes #28318 2017-08-21 03:32:56 +02:00
Frederik Rietdijk
c0cf19608f aspellWithDicts: create derivation with aspell and selected dictionaries
Currently, `aspell` checks the active profiles for dictionaries. While
this may be convenient, it does not work with `nix-shell` and it doesn't
allow any isolation.

This commit adds the possibility to use composition by creating a
derivation with `symlinkJoin` that contains all the chosen dictionaries,
and another derivation that wraps the executables linking to the dictionaries.

Nix example:

my_aspell = aspellWithDicts(ps: with ps; [ en nl ])

`nix-shell` example:

nix-shell -p 'aspellWithDicts(ps: with ps; [ en nl ])'
2017-07-17 10:17:20 +02:00
Benno Fünfstück
042e268612 Revert "aspell: only set ASPELL_CONF from NIX_PROFILES in wrapper if unset"
This reverts commit 399065f226ca70360f25682d76be3c5e89e60239.

I am blind, this was already checked above. Thanks @bjornfor for noticing.
2017-04-19 20:21:36 +02:00
Benno Fünfstück
399065f226 aspell: only set ASPELL_CONF from NIX_PROFILES in wrapper if unset 2017-04-19 17:14:51 +02:00
Leandro Lisboa Penz
ce6b5b8673 aspell: set default aspell data-dir if ASPELL_CONF is not set
if the user didn't set ASPELL_CONF, use it to point to the dictionary
location by first looking at NIX_PROFILE directories and then using
$HOME/.nix-profile.

See NixOS/nixpkgs#1000
2017-04-10 22:14:29 +01:00
Toni Reina
4e72d2da50 aspell-dict-ca: init at 2.1.5-1 2017-02-14 15:17:28 +01:00
Kranium Gikos Mendoza
56cb0f763e aspellDicts.en: 7.1-0 -> 2016.06.26-0 2016-07-03 22:45:22 +08:00
Alexey Shmalko
c68e823029 aspell-dict-uk: init at 1.4.0-0 (#15846) 2016-05-31 17:09:01 +02:00
Sergiu Ivanov
be590f1d9d aspell-dict-ro: init at 3.3-2 2016-03-07 19:42:26 +01:00
Bojan Nikolic
842613fb10 aspell: improve the doc string, fixes #11814
It is better to specify data-dir in the environmental variable since
then both the language description files and the dictionaries will be
found. Since dict-dir defaults to data-dir only the latter needs to be
set. See for example https://github.com/NixOS/nixpkgs/issues/1000
2015-12-22 01:56:27 +01:00
Mads Lindstrøm
012bb48a18 Adding Danish dictionary to Aspell 2015-04-16 19:37:41 +02:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimir Still
351c18b4fd aspell: Add Slovak dictionary. 2014-11-04 16:18:20 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Bjørn Forsman
2099f6282f aspell: set meta.platforms 2014-10-27 18:52:28 +01:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
John Wiegley
78d452c93c Change aspell configure to use $out/lib/aspell 2014-04-16 12:59:27 -05:00
AndersonTorres
0c79b76271 Aspell dictionaries update: Portuguese (pt_PT) and Brazilian (pt_BR) 2014-03-23 13:17:34 -03:00
AndersonTorres
9c60834b23 Adding support for Portuguese language for Aspell 2013-12-05 02:22:47 +01:00
Bjørn Forsman
28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Bjørn Forsman
8a9999e2bb aspell: add Norwegian dictionaries (Bokmal and Nynorsk) 2013-09-01 15:57:28 +02:00
Anders Claesson
ddf4f3748a Add Swedish dictionary for aspell 2013-09-01 13:58:07 +01:00
Vladimir Still
dce544ee6e aspell: Add Czech dictionary (pkgs.aspellDicts.cs). 2013-08-28 11:09:31 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
84d43394c6 pkgs/development/libraries/aspell/dictionaries.nix: strip trailing whitespace 2013-07-14 21:32:47 +02:00
Peter Simons
2741391fda Partially revert commit 075796e0531506fa106be1d2f47a9c866b70b99c.
The commit downgraded the german language dictionary from version 20030222-1 to
20120607 (and broke the build in the process). That change was probably not
intended?
2013-07-14 21:32:33 +02:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
075796e053 aspell dictionaries: update where possible and try to make it easier to automatically parse versions 2013-07-14 02:08:55 +03:00
Evgeny Egorochkin
dc54358ce9 Change package versions to conform to nixpkgs conventions. 2013-06-09 05:41:44 +03:00
Yury G. Kudryashov
71c28d0e33 Use meta.platforms
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Piotr Pietraszkiewicz
63ace05051 added polish dictionary to the list
svn path=/nixpkgs/trunk/; revision=28905
2011-08-29 21:45:42 +00:00
Ludovic Courtès
8fe3128e71 GNU Aspell 0.60.6.1.
svn path=/nixpkgs/trunk/; revision=28742
2011-08-22 17:37:59 +00:00
Marco Maggesi
0212a63e07 Add italian dictionary for aspell
svn path=/nixpkgs/trunk/; revision=21942
2010-05-22 16:53:17 +00:00
Eelco Dolstra
1408710472 * aspell: updated to 0.60.6 to make it compile on GCC 4.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14049
2009-02-12 19:34:03 +00:00
Ludovic Courtès
dbc5fb085c Add Aspell Esperanto dictionary.
svn path=/nixpkgs/trunk/; revision=10687
2008-02-14 13:39:03 +00:00
Eelco Dolstra
a65d6f9f59 * Emacs expects an alias called "nederlands" (not "dutch"), so provide
it.

svn path=/nixpkgs/trunk/; revision=10676
2008-02-14 10:26:17 +00:00
Ludovic Courtès
3925367ca2 Aspell: Use the `ASPELL_CONF' environment variable instead of patching Aspell.
A related change in `/etc/profile' will be checked in in the NixOS repository.

svn path=/nixpkgs/trunk/; revision=10672
2008-02-14 09:40:28 +00:00
Eelco Dolstra
6679941615 * aspell: hacked up a little patch to allow additional dictionary
directories to be specified through the environment variable
  ASPELL_EXTRA_DICT_DIRS.  This way dictionaries don't have to be
  installed into aspell's prefix.  Instead you can just set
  ASPELL_EXTRA_DICT_DIRS to $HOME/.nix-profile/lib/aspell and install
  dictionaries separately with nix-env (e.g. "nix-env -i
  aspell-dict-nl").
  
* Added a bunch of Aspell dictionaries.  Additional dictionaries can
  be added easily in development/libraries/aspell/dictionaries.nix.

svn path=/nixpkgs/trunk/; revision=9512
2007-10-23 16:33:11 +00:00
Martin Bravenboer
5983f91836 A pkgs/development/libraries/aspell/builder.sh
M    pkgs/development/libraries/aspell/default.nix

aspell comes without any dictionaries, so if you actually want to use
it you need to install additional dictionary packages. I've added the
package for English, but obviously more should be added. Dictionaries
are installed in the prefix of aspell.

M    pkgs/top-level/all-packages.nix

aspell dict package for English needs which

added an option enableMPlayer to wrapFirefox to disable the MPlayer
plugin. It's enabled by default.


svn path=/nixpkgs/trunk/; revision=8944
2007-07-04 01:35:29 +00:00
Martin Bravenboer
93393a6748 Added aspell
Added gtkspell

Added pidgin, builds but does not run yet:

running pidgin fails to find libX11.so.6. ldd on pidgin reports:

  libX11.so.6 => not found
  ....
  libX11.so.6 => /nix/store/brsva6rh1p2ymjvk7054a90is5panrhf-libX11-1.1.1/lib/libX11.so.6 (0xb7358000)

which looks a bit weird ... Maybe some problem with patchelf? Or just
a build problem and should the library path be set using an
environment variable?


svn path=/nixpkgs/trunk/; revision=8660
2007-05-13 14:22:24 +00:00