Commit Graph

233 Commits

Author SHA1 Message Date
Marc Weber
57baa6617f fix eclipse start script
svn path=/nixpkgs/trunk/; revision=15546
2009-05-11 06:00:27 +00:00
Eelco Dolstra
210ba6316e * Urgh. Some files that had been deleted in the trunk came back
through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403
2009-04-29 16:19:57 +00:00
Eelco Dolstra
914f2d6cf6 * Last sync.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15320
2009-04-26 17:21:58 +00:00
Marc Weber
3a9bfe866c adding small emacs session mode packages remembering inputs
svn path=/nixpkgs/trunk/; revision=15318
2009-04-26 11:06:54 +00:00
Eelco Dolstra
5a2284ac61 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15313
2009-04-25 22:45:32 +00:00
Ludovic Courtès
72656e7d1c GNU Zile 2.3.7.
svn path=/nixpkgs/trunk/; revision=15287
2009-04-24 12:48:37 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Andres Löh
d2f9333dca Made it even worse -- hopefully fixed now, sorry.
svn path=/nixpkgs/trunk/; revision=15186
2009-04-20 14:30:01 +00:00
Eelco Dolstra
e72b00b2d7 * Leksah: forgot to commit. Also, use makeWrapper to set
XDG_DATA_DIRS to gtksourceview; otherwise, gtksourceview can't find
  its syntax highlighting files.
* Updated gtk2hs to the latest version from Darcs.  Otherwise Leksah
  crashes on GHC 6.10.2.

svn path=/nixpkgs/trunk/; revision=15162
2009-04-19 19:06:34 +00:00
Lluís Batlle i Rossell
b211399689 Making nvi avoid /var/tmp.
svn path=/nixpkgs/trunk/; revision=15102
2009-04-16 20:09:07 +00:00
Lluís Batlle i Rossell
4cb42e9647 Adding nvi, another small vi clone.
svn path=/nixpkgs/trunk/; revision=15099
2009-04-16 19:28:57 +00:00
Lluís Batlle i Rossell
1ce494d81d Adding elvis, although I can't see the characters in an xterm with black background
svn path=/nixpkgs/trunk/; revision=15098
2009-04-16 19:28:42 +00:00
Eelco Dolstra
a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Sander van der Burg
6c3c5448d6 Upgraded kile to 2.0.3
svn path=/nixpkgs/trunk/; revision=14997
2009-04-12 16:08:13 +00:00
Ludovic Courtès
a1540b57ae GNU Zile 2.3.6.
svn path=/nixpkgs/trunk/; revision=14971
2009-04-09 13:51:39 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Marc Weber
807aae2fd6 updated eclipse binary to 3.5M6
thereby allowing the user to copy the whole store path to a user
location so that update sites work properly

svn path=/nixpkgs/trunk/; revision=14773
2009-03-30 10:32:53 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Ludovic Courtès
e9917baddd GNU Zile 2.3.4.
svn path=/nixpkgs/trunk/; revision=14432
2009-03-07 11:28:56 +00:00
Marc Weber
23ca0bb3c2 vim version (7.2), optional .nix filetype detection and syntax highlighting
svn path=/nixpkgs/trunk/; revision=14431
2009-03-07 00:27:13 +00:00
Marc Weber
b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Ludovic Courtès
fb9ace2e56 CEDET: Run the test suite the right way.
svn path=/nixpkgs/trunk/; revision=14318
2009-03-03 19:45:04 +00:00
Ludovic Courtès
1c7bf2d846 GNU Zile 2.3.3.
svn path=/nixpkgs/trunk/; revision=14317
2009-03-03 19:35:56 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Ludovic Courtès
fd93dfbe9d CEDET 1.0pre6.
svn path=/nixpkgs/trunk/; revision=14298
2009-03-02 15:11:54 +00:00
Ludovic Courtès
38dd615de3 CEDET: Fix installation.
svn path=/nixpkgs/trunk/; revision=14250
2009-02-25 21:12:13 +00:00
Ludovic Courtès
8fba10c951 Add GNU Zile, a tiny Emacs clone.
svn path=/nixpkgs/trunk/; revision=14249
2009-02-25 20:24:18 +00:00
Ludovic Courtès
a7cf0b2f02 Add CEDET, the umbrella project for Semantic and EIEIO.
svn path=/nixpkgs/trunk/; revision=14240
2009-02-25 14:30:50 +00:00
Ludovic Courtès
160b00c8b4 GNU Emacs 23.x: D-Bus support.
svn path=/nixpkgs/trunk/; revision=14207
2009-02-23 16:06:59 +00:00
Ludovic Courtès
722c3546af GNU Emacs live from CVS.
svn path=/nixpkgs/trunk/; revision=14107
2009-02-17 21:05:52 +00:00
Eelco Dolstra
390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Marc Weber
387478ce5e vim_configurable: build with gtk, fix passing features=huge
using gtk gvim does start much faster

svn path=/nixpkgs/trunk/; revision=14053
2009-02-12 20:27:56 +00:00
Marc Weber
fd948733a0 fix perl, ruby, tcl support in vim_configurable
svn path=/nixpkgs/trunk/; revision=14052
2009-02-12 20:27:54 +00:00
Ludovic Courtès
eebb6f106c Add Semantic, a parser generator for Emacs.
svn path=/nixpkgs/trunk/; revision=14012
2009-02-09 08:48:49 +00:00
Ludovic Courtès
8eb6ecb1ec Add EIEIO, a CLOS clone for Emacs.
svn path=/nixpkgs/trunk/; revision=14011
2009-02-09 08:34:25 +00:00
Ludovic Courtès
f8a207e806 GNU Emacs 23.x update (development snapshot).
svn path=/nixpkgs/trunk/; revision=13994
2009-02-06 08:43:31 +00:00
Eelco Dolstra
37b9b420cb * Sync with trunk. Back to gtkLibs214.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
2009-02-02 15:44:04 +00:00
Armijn Hemel
4df4bba69f ed 1.2
svn path=/nixpkgs/trunk/; revision=13928
2009-02-01 18:53:25 +00:00
Eelco Dolstra
c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +00:00
Marc Weber
e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Marc Weber
761e7453ab removed eclipse_classic_src (supreseded by eclipseNew)
svn path=/nixpkgs/trunk/; revision=13136
2008-10-28 12:56:34 +00:00
Marc Weber
fa6b7a742c using private mirror for eclipse
svn path=/nixpkgs/trunk/; revision=13122
2008-10-26 18:19:25 +00:00
Marc Weber
20a15e993b eclipse-new expression (update of eclipse_classic_src)
It supports now insntalling some plugins (however the eclipse path will be copied once)
You can still just copy the whole store path to you home directory to install additional
plugins using update sites

svn path=/nixpkgs/trunk/; revision=13121
2008-10-26 17:45:14 +00:00
Ludovic Courtès
624c3c9ff6 GNU ed 1.1.
svn path=/nixpkgs/trunk/; revision=13072
2008-10-15 07:26:14 +00:00
Ludovic Courtès
61f18ebe83 Quack: Update hash to the current version.
svn path=/nixpkgs/trunk/; revision=13008
2008-10-08 18:01:24 +00:00
Ludovic Courtès
b998c44e4c Change name' attribute of Emacs 23 to emacs-snapshot-23-xxx'.
This is so that "nix-env -u emacs" doesn't switch from, say, Emacs 22
to Emacs 23.

svn path=/nixpkgs/trunk/; revision=12894
2008-09-19 12:34:04 +00:00
Armijn Hemel
831deddc00 0.9 -> 1.0 (after 20 years or so)
svn path=/nixpkgs/trunk/; revision=12843
2008-09-11 17:30:57 +00:00
Ludovic Courtès
a2c47582b3 GNU Emacs 22.3.
svn path=/nixpkgs/trunk/; revision=12825
2008-09-08 12:10:22 +00:00
Eelco Dolstra
5d9dfc1e60 * Removed $installCommand, it's no longer needed since we split the
install and fixup phases.  You can just override installPhase.

svn path=/nixpkgs/trunk/; revision=12787
2008-09-02 13:51:32 +00:00
Ludovic Courtès
4162dfe9c5 EMMS: Default to the libtag info back-end for MP3s.
svn path=/nixpkgs/trunk/; revision=12683
2008-08-21 14:56:57 +00:00
Ludovic Courtès
d4e5ed0596 Add EMMS, the Emacs Multimedia System.
svn path=/nixpkgs/trunk/; revision=12675
2008-08-21 08:58:51 +00:00
Armijn Hemel
e60a0c2591 7.1 -> 7.2
svn path=/nixpkgs/trunk/; revision=12573
2008-08-10 15:05:08 +00:00
Sander van der Burg
3bd550f170 Some fixes
svn path=/nixpkgs/trunk/; revision=12450
2008-07-30 13:37:44 +00:00
Peter Simons
b1cdb57a77 maude-mode: new package
svn path=/nixpkgs/trunk/; revision=12361
2008-07-15 14:53:07 +00:00
Michael Raskin
9cb86e27bb Trying to fix x86_64 build..
svn path=/nixpkgs/trunk/; revision=12328
2008-07-09 13:03:25 +00:00
Peter Simons
d2aed129ea emacs: Link successfully on 64 bit.
I'm using this expression on a Linux 64-bit installation that's been patched
to use glibc 2.5, not the current version 2.7. My installation needs this
patch and it looks sensible enough to me, but I've been told that others can
install Emacs on 64 bit machines without this. Hopefully, this doesn't break
anything.

svn path=/nixpkgs/trunk/; revision=12303
2008-07-07 11:53:19 +00:00
Peter Simons
c4b77fbd37 haskell-mode: updated to version 2.4
Pass emacs package to this expression so that we can byte-compile the
lisp files.

svn path=/nixpkgs/trunk/; revision=12301
2008-07-07 11:49:57 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra
62835f4090 * Backported Andres' fix for building emacs-23 on x86_64 to emacs-22.
Also updated to Emacs 22.2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=12050
2008-06-12 09:21:18 +00:00
Eelco Dolstra
78d2e3cb30 * Fix on x86_64 (borrowed from emacs-unicode).
svn path=/nixpkgs/branches/stdenv-updates/; revision=12043
2008-06-11 20:04:42 +00:00
Andres Löh
2813fb46ad more pervasive crt-patching in emacs snapshot to make it work on my machine
svn path=/nixpkgs/trunk/; revision=12021
2008-06-09 14:21:36 +00:00
Eelco Dolstra
5edae446d8 * Move jedit to editors/jedit.
svn path=/nixpkgs/trunk/; revision=11978
2008-06-04 11:48:11 +00:00
Ludovic Courtès
d07956e45f GNU ed: Fix typo in description.
svn path=/nixpkgs/trunk/; revision=11717
2008-04-25 16:14:49 +00:00
Ludovic Courtès
51bf90108f Move GNU ed, add meta-information.
svn path=/nixpkgs/trunk/; revision=11715
2008-04-25 16:13:36 +00:00
Marc Weber
dcd4ea7fad Modified eclipse wrapper so that options are possed to the real eclipse executable now (so you can extend perm space easily.. )
svn path=/nixpkgs/trunk/; revision=11686
2008-04-22 18:26:57 +00:00
Ludovic Courtès
4c87a1d285 Remember: Fix tiny things.
svn path=/nixpkgs/trunk/; revision=11680
2008-04-22 09:07:34 +00:00
Sander van der Burg
ccb0730d5e Added kile editor
svn path=/nixpkgs/trunk/; revision=11665
2008-04-21 13:12:44 +00:00
Ludovic Courtès
7ea8e8a363 Add Remember, an Emacs mode to remember things.
svn path=/nixpkgs/trunk/; revision=11655
2008-04-18 14:27:42 +00:00
Ludovic Courtès
b936188ce8 Add Quack, an Emacs mode for Scheme.
svn path=/nixpkgs/trunk/; revision=11388
2008-03-31 12:22:39 +00:00
Tobias Hammerschmidt
3d2fe2382f updated eclipse to version 3.3.2 -- do we really need a special nix expression for jdt in development/eclipse?
svn path=/nixpkgs/trunk/; revision=11055
2008-03-11 13:40:27 +00:00
Marc Weber
64652c5dfc modified launch script so that you can copy the whole eclipse store directory to be able to use the update manager - maybe there is a better way?
svn path=/nixpkgs/trunk/; revision=10972
2008-03-06 00:49:31 +00:00
Marc Weber
4d6eef7a28 eclipse from source expression
svn path=/nixpkgs/trunk/; revision=10916
2008-03-02 21:17:23 +00:00
Eelco Dolstra
e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Ludovic Courtès
c9c4108a7d BBDB: Install Emacs Lisp code to `$out/share/emacs/site-lisp'; install documentation.
svn path=/nixpkgs/trunk/; revision=10769
2008-02-20 11:16:59 +00:00
Ludovic Courtès
067c7ed0af Install BBDB to `$out/share/emacs/site-lisp'.
svn path=/nixpkgs/trunk/; revision=10767
2008-02-20 10:32:22 +00:00
Eelco Dolstra
1bd2f3e93e * Enable building of mod_proxy.
svn path=/nixpkgs/trunk/; revision=10730
2008-02-18 14:59:48 +00:00
Tobias Hammerschmidt
f724e92f0f update to version 2.0.7, removed --enable-tiny because it breaks the user interface when the terminal where nano is running is resized
all featues disabled by --enable-tiny are still disabled

svn path=/nixpkgs/trunk/; revision=10719
2008-02-18 08:21:35 +00:00
Ludovic Courtès
c54243a009 Add BBDB, Emacs' Insidious Big Brother Database.
svn path=/nixpkgs/trunk/; revision=10625
2008-02-11 17:02:46 +00:00
Ludovic Courtès
f6f85016ec Emacs 22: Remove use of `/bin/pwd' in makefiles.
Among other things, this fixes installation of LEIM (Libraries of Emacs Input
Methods), where the `share/emacs/22.1/leim' directory would remain empty.

svn path=/nixpkgs/trunk/; revision=10621
2008-02-10 23:08:18 +00:00
Yury G. Kudryashov
e281a287b2 vim: now compiles in stdenv-updates (-lutil -lpthread)
svn path=/nixpkgs/branches/stdenv-updates/; revision=10525
2008-02-06 19:01:06 +00:00
Yury G. Kudryashov
98a81beaac meta.homepage added to several packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=10431
2008-01-31 10:41:45 +00:00
Yury G. Kudryashov
fbfab88e04 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.


svn path=/nixpkgs/branches/stdenv-updates/; revision=10429
2008-01-31 10:41:04 +00:00
Yury G. Kudryashov
81aac8d84d meta.homepage added to several packages
svn path=/nixpkgs/trunk/; revision=10417
2008-01-30 19:49:42 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Yury G. Kudryashov
da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00
Marc Weber
b4b61eccce svn path=/nixpkgs/trunk/; revision=10233 2008-01-20 22:47:08 +00:00
Eelco Dolstra
a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper.
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
2008-01-18 11:28:41 +00:00
Yury G. Kudryashov
a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Michael Raskin
ee17a4e153 Added python/tcl support to Vim; also xim - needed for deadkeys.
svn path=/nixpkgs/trunk/; revision=10120
2008-01-12 00:22:52 +00:00
Marc Weber
17ad9b8acd moved vim_configurable to much more sensible place
svn path=/nixpkgs/trunk/; revision=9931
2007-12-13 22:15:03 +00:00
Marc Weber
09c9eb9761 using patchelf now. This vim expression now has optional python support.
Should be dead easy to add the other scripting languages as well

svn path=/nixpkgs/trunk/; revision=9928
2007-12-13 09:50:22 +00:00
Marc Weber
224cb03f7c typo 'a' missing
svn path=/nixpkgs/trunk/; revision=9925
2007-12-12 11:48:36 +00:00
Marc Weber
9a4e9e7a3b vim_configurable example added. broken see comment.
svn path=/nixpkgs/trunk/; revision=9923
2007-12-12 07:20:41 +00:00
Marc Weber
a7872ec0ec Eclipse download location for x86_64 added
svn path=/nixpkgs/trunk/; revision=9900
2007-12-10 19:58:36 +00:00
Marc Weber
2b8778748a update provided by Tobias Hammerschmidt
svn path=/nixpkgs/trunk/; revision=9560
2007-10-30 22:15:39 +00:00
Eelco Dolstra
b724614087 * Newer Emacs 23.0.0.1 snapshot.
svn path=/nixpkgs/trunk/; revision=9519
2007-10-24 16:21:41 +00:00
Eelco Dolstra
ea9667ab18 * Fixed some more URLs.
svn path=/nixpkgs/trunk/; revision=9294
2007-09-11 11:15:37 +00:00