Commit Graph

591 Commits

Author SHA1 Message Date
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons
4afaf0be23 emacs-w3m: updated the SHA256 hash
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
2012-02-07 17:45:47 +00:00
Florian Friesdorf
2f7102afc0 emacs 24.0.93
svn path=/nixpkgs/trunk/; revision=32123
2012-02-07 17:40:05 +00:00
Florian Friesdorf
df12f0bd01 emacs js2-mode
svn path=/nixpkgs/trunk/; revision=32122
2012-02-07 17:40:02 +00:00
Florian Friesdorf
f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode
svn path=/nixpkgs/trunk/; revision=32119
2012-02-07 17:39:54 +00:00
Florian Friesdorf
4e3afe1b8d emacs mode calfw-1.3
svn path=/nixpkgs/trunk/; revision=32118
2012-02-07 17:39:51 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons
ace1095639 upgraded emacs-w3m
svn path=/nixpkgs/trunk/; revision=32080
2012-02-06 19:08:58 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Arie Middelkoop
d6f60f7135 emacs htmlize: fix of broken source url.
svn path=/nixpkgs/trunk/; revision=31827
2012-01-24 22:06:35 +00:00
Florian Friesdorf
5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +00:00
Peter Simons
e926d8d9f2 emacs: updated 23.3 to 23.3b
svn path=/nixpkgs/trunk/; revision=31771
2012-01-21 18:46:37 +00:00
Peter Simons
e86daecce9 emacs: strip trailing whitespace from expression for 23.x
svn path=/nixpkgs/trunk/; revision=31770
2012-01-21 18:46:28 +00:00
Florian Friesdorf
c554168536 org-7.8.03
svn path=/nixpkgs/trunk/; revision=31765
2012-01-21 18:29:06 +00:00
Florian Friesdorf
57733bae5d remove emacsSnapshot in favour of emacs24
svn path=/nixpkgs/trunk/; revision=31764
2012-01-21 18:29:02 +00:00
Florian Friesdorf
0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Florian Friesdorf
aa277f7d06 emacs-23 as base for emacs-24
svn path=/nixpkgs/trunk/; revision=31762
2012-01-21 18:28:54 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Ludovic Courtès
449c5b537d GNU Zile 2.4.3.
svn path=/nixpkgs/trunk/; revision=31664
2012-01-18 20:51:58 +00:00
Peter Simons
db009e0eb8 emacs org-mode: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31645
2012-01-18 20:32:10 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Arie Middelkoop
b02bc1ef59 Update of the 'jedit' package.
svn path=/nixpkgs/trunk/; revision=31614
2012-01-17 22:40:05 +00:00
Yury G. Kudryashov
3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Karn Kallio
ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Florian Friesdorf
5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf
f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf
195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Yury G. Kudryashov
08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Peter Simons
1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0
svn path=/nixpkgs/trunk/; revision=31106
2011-12-26 20:24:59 +00:00
Yury G. Kudryashov
b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Karn Kallio
135fe9059f ProofGeneral 4.1
svn path=/nixpkgs/trunk/; revision=30863
2011-12-13 01:13:46 +00:00
Eelco Dolstra
39c8bfdcc4 * New version of ‘ed’. W00t!
svn path=/nixpkgs/branches/stdenv-updates/; revision=30862
2011-12-12 23:44:49 +00:00
Ludovic Courtès
db1b4e2edc GNU Zile: Fix cross-compilation.
svn path=/nixpkgs/trunk/; revision=30414
2011-11-13 21:28:29 +00:00
Ludovic Courtès
e26fc2311a GNU Zile 2.4.2.
svn path=/nixpkgs/trunk/; revision=30110
2011-10-30 00:00:25 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
2011-10-08 12:06:03 +00:00
Yury G. Kudryashov
c7d6b60287 Drop kde3.kile
Use kde4.kile instead

svn path=/nixpkgs/trunk/; revision=29715
2011-10-07 20:46:29 +00:00
Yury G. Kudryashov
dd19f22e7e Add kde4.kile
svn path=/nixpkgs/trunk/; revision=29622
2011-10-04 11:12:11 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms
svn path=/nixpkgs/trunk/; revision=29596
2011-10-02 21:15:36 +00:00
Ludovic Courtès
2af4615ea8 GNU TeXmacs 1.0.7.11.
svn path=/nixpkgs/trunk/; revision=29012
2011-09-04 23:05:57 +00:00
David Guibert
11e9d58bcf eclipse 3.7 (java and cpp)
svn path=/nixpkgs/trunk/; revision=28619
2011-08-16 18:17:31 +00:00
Yury G. Kudryashov
31ab846d05 Upgrade kdevelop and kdevplatform
svn path=/nixpkgs/trunk/; revision=28604
2011-08-15 23:39:20 +00:00
Peter Simons
493e36669c haskell-leksah: updated build expression for recent versions of cabal.nix
svn path=/nixpkgs/trunk/; revision=28512
2011-08-12 11:02:44 +00:00
Peter Simons
d0e60c7130 leksah: disable Darwin builds
The expression needs more attention before it can be built on platforms
other than Linux:

  at `haskellPackages.leksahServer' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

  at `haskellPackages.leksah' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

svn path=/nixpkgs/trunk/; revision=28412
2011-08-09 07:49:41 +00:00
Andres Löh
ce5ccbb0ea Updating leksah.
svn path=/nixpkgs/trunk/; revision=28376
2011-08-08 07:41:45 +00:00
Peter Simons
f80ef6645b magit: fixed download url
svn path=/nixpkgs/trunk/; revision=27821
2011-07-18 13:45:47 +00:00
Peter Simons
ea4daca60d pkgs/applications/editors/emacs-modes/bbdb: replace custom build script with standard builder
Also added most of optional contributions shipped in the release tarball to the
installation.

svn path=/nixpkgs/trunk/; revision=27646
2011-07-07 21:04:56 +00:00
Ludovic Courtès
99e79048d4 GNU Zile 2.3.24.
svn path=/nixpkgs/trunk/; revision=27326
2011-05-30 21:49:31 +00:00
Marco Maggesi
503f04ca54 ProofGeneral 4.0
svn path=/nixpkgs/trunk/; revision=27252
2011-05-14 20:59:53 +00:00
Florian Friesdorf
ce249b627b org: include more pdf doc, yet failing html-doc and contrib/
contrib is added as profile/share/org/contrib, better ideas
welcome. profile/share/doc/org-7.5/contrib could be an option but then
one needs to adjust personal emacs config to point to the new
contrib/lisp dir with each upgrade.

svn path=/nixpkgs/trunk/; revision=26805
2011-04-12 15:09:30 +00:00
Florian Friesdorf
f1b0d532b2 org: added myself as maintainer as I intend to help looking after it
svn path=/nixpkgs/trunk/; revision=26804
2011-04-12 12:28:42 +00:00
Florian Friesdorf
dc5e18f626 emacs org mode 7.4 -> 7.5
svn path=/nixpkgs/trunk/; revision=26803
2011-04-12 12:28:37 +00:00
Eelco Dolstra
1c2ba5bcec * Add the Eclipse Modeling Tools.
svn path=/nixpkgs/trunk/; revision=26799
2011-04-12 08:41:53 +00:00
Eelco Dolstra
e91e1cfe76 * Eclipse: don't use an ugly "version" argument. Instead there now is
a function "buildEclipse" that takes a binary Eclipse distribution
  plus metadata as arguments.  The package name now distinguishes
  between Eclipse distributions (e.g. "eclipse-sdk" for Classic,
  "eclipse-cpp" for the C/C++ IDE).

svn path=/nixpkgs/trunk/; revision=26787
2011-04-11 20:29:47 +00:00
Karn Kallio
3ce36f7d72 Bump eclipse version to 3.6.2 after 3.6.1 disappeared from source server.
svn path=/nixpkgs/trunk/; revision=26750
2011-04-08 08:06:11 +00:00
Ludovic Courtès
fe5b564e6b Magit: Install to $out.
svn path=/nixpkgs/trunk/; revision=26524
2011-03-26 11:50:01 +00:00
Peter Simons
1dbbeeab2c magit: updated to version 1.0.0
svn path=/nixpkgs/trunk/; revision=26515
2011-03-25 12:59:09 +00:00
Ludovic Courtès
cc91f09d6b GNU Zile 2.3.23.
svn path=/nixpkgs/trunk/; revision=26480
2011-03-23 21:55:54 +00:00
Eelco Dolstra
f208edd1a5 * Merge the x-updates branch.
svn path=/nixpkgs/trunk/; revision=26330
2011-03-15 18:29:27 +00:00
Russell O'Connor
22fbb1f3d9 Adding freetype dependency for TeXmacs.
svn path=/nixpkgs/trunk/; revision=26306
2011-03-14 22:03:26 +00:00
Eelco Dolstra
3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Russell O'Connor
43bed60351 Fix PDF export.
svn path=/nixpkgs/trunk/; revision=26293
2011-03-14 00:04:30 +00:00
Ludovic Courtès
1ddb8e3f44 GNU TeXmacs 1.0.7.10.
svn path=/nixpkgs/trunk/; revision=26258
2011-03-10 14:53:56 +00:00
Ludovic Courtès
7e8149bf87 GNU Emacs 23.3.
svn path=/nixpkgs/trunk/; revision=26255
2011-03-10 14:53:41 +00:00
Ludovic Courtès
38d4789236 GNU Zile 2.3.22.
svn path=/nixpkgs/trunk/; revision=26253
2011-03-10 14:53:30 +00:00
Eelco Dolstra
a9633d80de * Emacs: don't depend on dbus on non-Linux platforms.
svn path=/nixpkgs/branches/x-updates/; revision=26007
2011-02-17 10:17:49 +00:00
Russell O'Connor
7748f89d86 Bump TeXmacs to verion 1.0.7.9.
svn path=/nixpkgs/trunk/; revision=25770
2011-02-03 16:23:05 +00:00
Ludovic Courtès
7c88378532 Org 7.4.
svn path=/nixpkgs/trunk/; revision=25484
2011-01-10 09:55:28 +00:00
Eelco Dolstra
c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Evgeny Egorochkin
9b4c2f5f56 Emacs PHP mode: packaged. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=25216
2010-12-21 04:40:38 +00:00
Lluís Batlle i Rossell
b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Lluís Batlle i Rossell
99831841f0 Updating the urls where to get nvi from. The previous did not work anymore.
I took some from the list provided by:
http://dir.filewatcher.com/d/Perl-CPAN/misc/nvi-1.79.tar.gz.1295401.html

svn path=/nixpkgs/trunk/; revision=25140
2010-12-15 09:39:30 +00:00
Ludovic Courtès
8416f47e26 GNU Zile 2.3.21.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25075
2010-12-12 20:19:03 +00:00
Michael Raskin
6af8a1debd Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
2010-11-22 11:39:42 +00:00
Rob Vermaas
db8748b170 added eclipse 3.6.1, maven3, szip
svn path=/nixpkgs/trunk/; revision=24772
2010-11-19 13:24:11 +00:00
Michael Raskin
fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Andres Löh
ad9d05d909 Version bump for leksah (plus dependencies). Now works with ghc-6.12.3.
svn path=/nixpkgs/trunk/; revision=24737
2010-11-17 14:48:12 +00:00
Ludovic Courtès
08d9437bce Quack 0.39.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24670
2010-11-11 22:12:02 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Ludovic Courtès
94d5ee9410 GNU TeXmacs 1.0.7.6.
svn path=/nixpkgs/trunk/; revision=24546
2010-10-30 21:44:16 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Ludovic Courtès
57ed005e24 GNU EMMS: Add dependency on MP3Info.
svn path=/nixpkgs/trunk/; revision=24365
2010-10-19 13:20:24 +00:00
Ludovic Courtès
bf006e3fd2 GNU Zile 2.3.20.
svn path=/nixpkgs/trunk/; revision=24358
2010-10-19 08:09:35 +00:00
Lluís Batlle i Rossell
46201622cb Making vim73 cross-build (it needs a patch)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24243
2010-10-12 18:33:02 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Peter Simons
789c12add5 pkgs/applications/editors/emacs-modes/haskell: updated to version 2.8.0
svn path=/nixpkgs/trunk/; revision=24136
2010-10-07 13:14:01 +00:00
Peter Simons
48ecb667ab pkgs/applications/editors/emacs-modes/haskell: added meta section
svn path=/nixpkgs/trunk/; revision=24134
2010-10-07 13:13:42 +00:00
Yury G. Kudryashov
67b5d732a2 Move kdevplatform and kdevelop to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24063
2010-10-05 05:43:39 +00:00
Russell O'Connor
228303d47e Merging roconnor's and ludo' texmacs derivations.
texmacs now has extra font options.
texmacs is abstracted over which tex it uses (AFAIK texmacs only uses metafont).
texmacs now depends on aspell, ghostscript soft dependencies.

svn path=/nixpkgs/trunk/; revision=24054
2010-10-04 15:07:38 +00:00
Evgeny Egorochkin
c9ad6ec90a Packaged Gobby
svn path=/nixpkgs/trunk/; revision=24040
2010-10-04 04:15:23 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell
bc92057a17 Making vim some configurable options go through getConfig.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24033
2010-10-03 09:18:14 +00:00
Lluís Batlle i Rossell
530ac48a7c Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24031
2010-10-03 09:17:22 +00:00
Michael Raskin
2fed251436 Update vim_configurable to 7.3
svn path=/nixpkgs/trunk/; revision=24014
2010-10-01 05:01:32 +00:00
Armijn Hemel
8db80a9616 update to 7.3
svn path=/nixpkgs/trunk/; revision=24008
2010-09-30 17:00:13 +00:00
Lluís Batlle i Rossell
c00b676654 Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/trunk/; revision=23859
2010-09-18 16:29:47 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Peter Simons
c66aa309be pkgs/applications/editors/emacs-modes/magit: updated to version 0.8.2
svn path=/nixpkgs/trunk/; revision=23697
2010-09-09 16:06:34 +00:00
Ludovic Courtès
78adb9fbf1 org-mode: Pass the full path to which'; use callPackage'.
svn path=/nixpkgs/trunk/; revision=23657
2010-09-06 07:58:13 +00:00
Lluís Batlle i Rossell
cf6f753176 Fixing the url for nvi (the older was not available anymore)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23638
2010-09-05 05:59:27 +00:00
Eelco Dolstra
9b22cac306 * Fix the nvi URL.
svn path=/nixpkgs/trunk/; revision=23621
2010-09-03 15:32:40 +00:00
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Peter Simons
62021d80dc pkgs/applications/editors/emacs-modes/maude: the "official" maude mode is crap; use the one from sourceforge instead
svn path=/nixpkgs/trunk/; revision=23471
2010-08-26 19:03:52 +00:00
Peter Simons
687c9ddb3e pkgs/applications/editors/emacs-modes/maude: updated to version 2
svn path=/nixpkgs/trunk/; revision=23468
2010-08-26 18:19:19 +00:00
Peter Simons
8b2437156b Correct the output directory adding missing prefix "share".
svn path=/nixpkgs/trunk/; revision=23383
2010-08-24 08:26:48 +00:00
Peter Simons
14760d869b Add Nix expression for Emacs mode htmlize.
svn path=/nixpkgs/trunk/; revision=23382
2010-08-24 08:25:51 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Ludovic Courtès
b4f887b7fb GNU Zile 2.3.19.
svn path=/nixpkgs/trunk/; revision=23254
2010-08-19 16:53:28 +00:00
Lluís Batlle i Rossell
51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
2010-08-11 20:14:25 +00:00
Lluís Batlle i Rossell
46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Michael Raskin
e8a33e0c82 Make configurable Vim build with most options
svn path=/nixpkgs/trunk/; revision=22924
2010-08-03 10:59:57 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Eelco Dolstra
d81ed8201f * Turn vim/default.nix into a regular package. We don't need two
configurable VIMs.

svn path=/nixpkgs/trunk/; revision=22784
2010-07-28 12:52:54 +00:00
Eelco Dolstra
6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Peter Simons
d137679f20 pkgs/applications/editors/emacs-modes/rudel: added rudel 0.2-4
A collaborative editing environment for GNU Emacs.

svn path=/nixpkgs/trunk/; revision=22733
2010-07-26 13:41:03 +00:00
Ludovic Courtès
f497701642 Add upstream Org-Mode.
svn path=/nixpkgs/trunk/; revision=22693
2010-07-22 08:59:12 +00:00
Peter Simons
cc6c486560 pkgs/applications/editors/emacs-modes/haskell: updated to version 2.7.0
svn path=/nixpkgs/trunk/; revision=22679
2010-07-20 14:53:35 +00:00
Ludovic Courtès
04082d00f3 GNU Zile 2.3.17.
svn path=/nixpkgs/trunk/; revision=22456
2010-07-04 21:10:27 +00:00
Lluís Batlle i Rossell
86345919c2 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
2010-06-14 09:28:10 +00:00
Ludovic Courtès
82c1349503 Proof General: Build and install via the makefile.
svn path=/nixpkgs/trunk/; revision=22162
2010-06-06 22:39:28 +00:00
Lluís Batlle i Rossell
fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
2010-05-25 20:38:18 +00:00
Ludovic Courtès
6eefe563bd GNU Zile: Make `help2man' a native build input.
svn path=/nixpkgs/trunk/; revision=21940
2010-05-21 15:07:47 +00:00
Lluís Batlle i Rossell
6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it)
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
2010-05-19 15:26:00 +00:00
Peter Simons
8d1637de33 pkgs/top-level/all-packages.nix, pkgs/applications/editors/emacs-23: prefer makeOverridable over getPkgConfig to customize GNU Emacs
Changed 'emacs23' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the actual build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21873
2010-05-19 12:26:21 +00:00
Peter Simons
6d7f97bd0b pkgs/applications/editors/emacs-23: Darwin builds require libXaw to avoid link-time errors
svn path=/nixpkgs/trunk/; revision=21858
2010-05-19 12:25:31 +00:00
Alexander Tsamutali
03d8babdf5 applications/editors/emacs-modes/jabber: New nixbuild.
svn path=/nixpkgs/trunk/; revision=21806
2010-05-16 20:32:21 +00:00
Peter Simons
8f8b0bc3ad pkgs/applications/editors/emacs-{22,23}: don't restrict this build to Linux
It looks like the recent update broke the package on all platforms other than
Linux, but no-one seems to have noticed. Hydra certainly didn't. That's not
particularly satisfactory. Surely, we would like Emacs to build on Darwin, BSD,
and other platforms, too?

svn path=/nixpkgs/trunk/; revision=21773
2010-05-14 09:54:31 +00:00
Peter Simons
55a322022c pkgs/applications/editors/emacs-modes/magit: bumped to 0.8 release
svn path=/nixpkgs/trunk/; revision=21737
2010-05-12 09:09:55 +00:00
Ludovic Courtès
f19a35aeeb Magit: Latest version.
The tarball at crypt.to had vanished, and hopefully `fetchgit' over HTTP
will work for everyone.

svn path=/nixpkgs/trunk/; revision=21722
2010-05-11 14:56:28 +00:00
Ludovic Courtès
c63a2c79a4 GNU Zile 2.3.16.
svn path=/nixpkgs/trunk/; revision=21696
2010-05-09 23:14:34 +00:00
Ludovic Courtès
e583aae98c Emacs: Add optional dependencies on GConf and librsvg.
svn path=/nixpkgs/trunk/; revision=21694
2010-05-09 23:14:23 +00:00
Marc Weber
d86dace29b adding Eclipse note,
readding older version.
adding eclipseLatest top level name

svn path=/nixpkgs/trunk/; revision=21684
2010-05-09 14:17:21 +00:00
Ludovic Courtès
8edf4f1896 GNU Emacs 23.2.
svn path=/nixpkgs/trunk/; revision=21680
2010-05-09 12:46:22 +00:00
Marc Weber
8a79919093 fix flash player debug build
svn path=/nixpkgs/trunk/; revision=21411
2010-04-28 20:02:40 +00:00
Lluís Batlle i Rossell
6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +00:00
Marc Weber
d75d0cbb6a Eclipse update
svn path=/nixpkgs/trunk/; revision=21169
2010-04-19 16:47:41 +00:00
Armijn Hemel
e0f50ecb39 update to 2.2.3
svn path=/nixpkgs/trunk/; revision=21008
2010-04-11 12:13:23 +00:00
Lluís Batlle i Rossell
19b9811012 Making a bunch of basic programs cross-buildable.
After this, the 'bootstrap-tools' can be cross-built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
2010-04-04 18:10:42 +00:00
Peter Simons
47e93b4177 pkgs/applications/editors/emacs-modes/magit: fixed cut&paste error in name attribute
Thanks, Eelco!

svn path=/nixpkgs/trunk/; revision=20780
2010-03-23 12:29:21 +00:00
Peter Simons
bba9ecdbac pkgs/applications/editors/emacs-modes/magit: updated to version 0.7-109-g0fc3980
svn path=/nixpkgs/trunk/; revision=20779
2010-03-23 11:56:44 +00:00
Peter Simons
cab868b9a3 pkgs/applications/editors/emacs-modes/magit: download tarball from cryp.to
The idea of downloading the source code tarball directly from gitorious.org was
great, but didn't work. Apparently, those tarballs have different checksums
every time they're generated. To remedy the situation, I've copied the proper
tarball statically to <http://cryp.to/magit-mainline-0.7-94-gbf42bf8.tar.gz>.

svn path=/nixpkgs/trunk/; revision=20653
2010-03-16 12:51:45 +00:00
Peter Simons
b6d6f301c4 pkgs/applications/editors/emacs-modes/magit: updated to version magit-0.7-94-gbf42bf8
Magit has seen plenty of development since version 0.7, but for some reason
there haven't been any new releases. This version bump updates the expression to
build a current version of Magit directly from the Git repository.

This change adds buildInputs 'autoconf' and 'automake'. These tools are required
only because we aren't building from a proper release tarball. Once version 0.8
comes out, these dependencies can be dropped again.

svn path=/nixpkgs/trunk/; revision=20650
2010-03-16 12:13:40 +00:00
Ludovic Courtès
21e05c5ff3 GNU Zile 2.3.15.
svn path=/nixpkgs/trunk/; revision=20361
2010-03-04 11:10:35 +00:00
Ludovic Courtès
f1fcbc0fc9 Fix JDEE.
The SVN history has apparently been modified in place.

svn path=/nixpkgs/trunk/; revision=20313
2010-03-01 17:08:08 +00:00
Michael Raskin
01d5ec596b Some more optional features for Vim
svn path=/nixpkgs/trunk/; revision=20288
2010-02-28 17:54:41 +00:00
Michael Raskin
9df96554ec Make Vim source overridable and add ECL configuration information. Currently Vim with ECL support requires unofficial source package, like the one retrievable from http://repo.or.cz/w/vim_extended.git
svn path=/nixpkgs/trunk/; revision=20200
2010-02-23 18:10:42 +00:00
Marc Weber
4007d19700 fix vim_configurable
svn path=/nixpkgs/trunk/; revision=20084
2010-02-18 01:49:22 +00:00
Marco Maggesi
513d653d68 Add HOL Light and its dependencies.
Add pkgs/applications/science/logic/hol_light
and pkgs/applications/science/emacs-modes/hol_light

Some functionalities of HOL Light requires the compiled sources of
OCaml.  For now we provide a new package ocaml_with_sources.  After
this shuold be merged with the current version of OCaml already
present in nixpkgs.


svn path=/nixpkgs/trunk/; revision=20008
2010-02-15 11:00:02 +00:00
Armijn Hemel
4f84a616d9 update to 2.2.1
svn path=/nixpkgs/trunk/; revision=19097
2009-12-24 21:37:18 +00:00
Marco Maggesi
218bdaf214 Add expression for ProofGeneral
svn path=/nixpkgs/trunk/; revision=18904
2009-12-11 16:18:27 +00:00
Peter Simons
af0a961e3d pkgs/applications/editors/emacs-modes/prolog: initial version of prolog-mode for Emacs
svn path=/nixpkgs/trunk/; revision=18675
2009-11-27 17:40:56 +00:00
Eelco Dolstra
11c3e92738 * Bring back Emacs 22 by request from Ludovic.
svn path=/nixpkgs/trunk/; revision=18529
2009-11-22 16:29:15 +00:00
Eelco Dolstra
86f8f47d87 * eclipse-classic -> eclipse.
svn path=/nixpkgs/trunk/; revision=18486
2009-11-20 15:33:06 +00:00
Eelco Dolstra
e0491358eb * Removed a lot of old Eclipse versions.
* Cleaned up the Eclipse classic expression a bit (e.g. use
  makeWrapper).  Also fall back to GTK 2.16 to fix some GUI glitches.

svn path=/nixpkgs/trunk/; revision=18485
2009-11-20 15:19:00 +00:00
Eelco Dolstra
58f543f19f * Remove some old Emacs versions.
svn path=/nixpkgs/trunk/; revision=18470
2009-11-19 17:36:43 +00:00
Peter Simons
3659747127 pkgs/applications/editors/emacs-modes/haskell/default.nix: updated to version 2.6.1
svn path=/nixpkgs/trunk/; revision=18089
2009-11-04 10:29:38 +00:00
Sander van der Burg
5ed64ae7c0 Enabled my eclipse package again, since I want to have eclipse installed when typing nix-env -i. BTW. the eclipse plugins can be installed this way either
svn path=/nixpkgs/trunk/; revision=18074
2009-11-03 11:00:18 +00:00
Ludovic Courtès
dc673480e6 GNU Zile 2.3.13.
svn path=/nixpkgs/trunk/; revision=18066
2009-11-01 20:55:14 +00:00
Ludovic Courtès
be6b6b73f9 Add Emacs Scala-Mode.
svn path=/nixpkgs/trunk/; revision=17904
2009-10-20 15:12:29 +00:00
Lluís Batlle i Rossell
7e3bcbd4c2 Made the small vim (attribute 'vim') have --enable-multibyte. Not that a luxurious
features, in these times of utf-8, and at the end our ncurses has multibyte.

svn path=/nixpkgs/trunk/; revision=17757
2009-10-12 14:29:07 +00:00
Peter Simons
49afefdb19 emacs-23: hacky fix to libXaw linker errors on MacOS X
When building Emacs on MacOS X, the configure script believes that libXaw is
available and tries to link it (even when, in fact, libXaw is not available).
To work around that problem, we make Xaw support mandatory on MacOS X.

svn path=/nixpkgs/trunk/; revision=17610
2009-10-02 13:57:26 +00:00
Peter Simons
7ec88bf6bd emacs-23: apply the crt{1,i,n}.o patch only on Linux
svn path=/nixpkgs/trunk/; revision=17603
2009-10-02 12:45:13 +00:00
Ludovic Courtès
5873baddb7 GNU Zile 2.3.12.
svn path=/nixpkgs/trunk/; revision=17420
2009-09-25 15:24:25 +00:00
Marc Weber
862fcb0252 adding alsa-plugin and patching alsa so that you can tell it about additional plugins
svn path=/nixpkgs/trunk/; revision=17316
2009-09-20 21:54:23 +00:00
Michael Raskin
0af49d8e96 Fix typos
svn path=/nixpkgs/trunk/; revision=17223
2009-09-17 10:26:55 +00:00
Ludovic Courtès
cad5eea4d6 Build Emacs only on GNU/Linux.
svn path=/nixpkgs/trunk/; revision=17220
2009-09-17 09:52:11 +00:00
Marc Weber
c8ee5671cb commenting Eclipse - use the new eclipseRunner instead
svn path=/nixpkgs/trunk/; revision=17079
2009-09-13 08:54:55 +00:00
Rob Vermaas
f016a6bcbc * stratego-mode for emacs
svn path=/nixpkgs/trunk/; revision=16910
2009-09-01 14:27:24 +00:00
Ludovic Courtès
a56fecb102 JDEE: Update.
svn path=/nixpkgs/trunk/; revision=16797
2009-08-21 08:43:07 +00:00
Andres Löh
92f8b3767f Version bump for leksah.
svn path=/nixpkgs/trunk/; revision=16642
2009-08-10 12:43:30 +00:00
Peter Simons
caaec0b4d6 pkgs/applications/editors/emacs-23/builder.sh: recognize path of 64-bit crt{1,i,n}.o files
Deja vu?

svn path=/nixpkgs/trunk/; revision=16591
2009-08-05 13:39:51 +00:00
Ludovic Courtès
9e8792548d GNU Emacs 23.1.
svn path=/nixpkgs/trunk/; revision=16529
2009-07-31 22:25:05 +00:00
Ludovic Courtès
7f22bca190 Quack 0.37.
svn path=/nixpkgs/trunk/; revision=16453
2009-07-24 12:41:47 +00:00
Ludovic Courtès
3451ae1a64 JDEE: Augment `jde-help-docsets.patch'; actually use it.
svn path=/nixpkgs/trunk/; revision=16413
2009-07-17 14:22:02 +00:00
Ludovic Courtès
13e3c0d7b9 JDEE: Don't install non-JAR files under `lib/java'.
svn path=/nixpkgs/trunk/; revision=16403
2009-07-16 15:39:05 +00:00
Ludovic Courtès
82c5ea7bc6 JDEE: Install bsh commands.
svn path=/nixpkgs/trunk/; revision=16402
2009-07-16 15:21:15 +00:00
Ludovic Courtès
e4d8c334b4 JDEE: Add wizard usability patch.
svn path=/nixpkgs/trunk/; revision=16395
2009-07-16 14:05:14 +00:00
Ludovic Courtès
aa699024db GNU Ed 1.4.
svn path=/nixpkgs/trunk/; revision=16365
2009-07-14 21:59:16 +00:00
Ludovic Courtès
f6533bc527 Emacs-w3m: Substitute `identify' from ImageMagick.
svn path=/nixpkgs/trunk/; revision=16328
2009-07-11 10:30:48 +00:00
Ludovic Courtès
18ef0d1673 emacs-w3m: Fix typo.
svn path=/nixpkgs/trunk/; revision=16325
2009-07-10 17:53:49 +00:00
Ludovic Courtès
45f7159af3 emacs-w3m: Get the source from CVS.
svn path=/nixpkgs/trunk/; revision=16323
2009-07-10 16:01:50 +00:00
Ludovic Courtès
186f62d354 JDEE: Provide a sensible default for `jde-help-docsets'.
svn path=/nixpkgs/trunk/; revision=16320
2009-07-10 14:30:24 +00:00
Ludovic Courtès
059ffb766e JDEE: Fix `jde-help-find-javadoc'.
svn path=/nixpkgs/trunk/; revision=16319
2009-07-10 14:21:26 +00:00
Ludovic Courtès
5c7cc2ffdb JDEE: Fix infinite recursion in `jde-directory-files-recurs'.
svn path=/nixpkgs/trunk/; revision=16318
2009-07-10 14:13:52 +00:00
Ludovic Courtès
df646c8ae4 Emacs-w3m: Add ImageMagick as a build input.
svn path=/nixpkgs/trunk/; revision=16288
2009-07-09 16:09:09 +00:00
Ludovic Courtès
2caabd37e1 Add Emacs-w3m, an Emacs interface to the W3M web browser.
svn path=/nixpkgs/trunk/; revision=16287
2009-07-09 15:56:40 +00:00
Ludovic Courtès
d490682e3b Remove Semantic and EIEIO, now part of CEDET.
svn path=/nixpkgs/trunk/; revision=16283
2009-07-09 15:29:14 +00:00
Ludovic Courtès
7cd0bee0c7 GNU Zile 2.3.8.
svn path=/nixpkgs/trunk/; revision=16260
2009-07-08 16:44:19 +00:00
Ludovic Courtès
e8bd387f04 jdee: More Java path fixes.
svn path=/nixpkgs/trunk/; revision=16251
2009-07-08 14:20:46 +00:00
Ludovic Courtès
bf5141245f jdee: Improve (fix?) Emacs 23 `avl-tree' compatibility.
svn path=/nixpkgs/trunk/; revision=16250
2009-07-08 13:56:08 +00:00
Ludovic Courtès
845a74db93 jdee: Fix path to the Java files.
svn path=/nixpkgs/trunk/; revision=16249
2009-07-08 13:23:32 +00:00
Ludovic Courtès
ea808c50ce Add ECB, the Emacs Code Browser.
svn path=/nixpkgs/trunk/; revision=16234
2009-07-08 09:01:11 +00:00
Ludovic Courtès
df4a8eafde Add JDEE, the Java development environment for Emacs.
svn path=/nixpkgs/trunk/; revision=16222
2009-07-07 16:13:45 +00:00
Eelco Dolstra
255a4a91f0 * Get rid of some dietlibc stuff.
svn path=/nixpkgs/trunk/; revision=16132
2009-07-02 08:58:58 +00:00
Marc Weber
349de9bafe revrting my accident only keeping rubygem updates and ruby libs
This partially reverts commit -r 16100

svn path=/nixpkgs/trunk/; revision=16107
2009-06-30 15:58:02 +00:00
Marc Weber
d1e39e78f9 adding rubygems support to nix - implemented target libraries/apps: sup mail client
svn path=/nixpkgs/trunk/; revision=16100
2009-06-30 14:29:20 +00:00
Ludovic Courtès
1526ba9d33 Rename emacsUnicode' to emacs23'.
svn path=/nixpkgs/trunk/; revision=16073
2009-06-27 23:09:21 +00:00
Ludovic Courtès
f156a809cc Update GNU Emacs 23 snapshot.
svn path=/nixpkgs/trunk/; revision=16072
2009-06-27 23:00:32 +00:00
Ludovic Courtès
7519caa4f4 Quack 0.36.
svn path=/nixpkgs/trunk/; revision=16068
2009-06-27 21:05:43 +00:00
Peter Simons
0ee475b7f9 Renamed "magit-mode" to "magit", which is the upstream package name anyway.
svn path=/nixpkgs/trunk/; revision=16067
2009-06-27 13:28:39 +00:00
Peter Simons
b12683e174 Added magit-mode 0.7, an Emacs mode for managing Git repositories.
svn path=/nixpkgs/trunk/; revision=16042
2009-06-25 14:31:20 +00:00
Eelco Dolstra
151031e233 * Fix nix-env evaluation on non-Linux platforms.
svn path=/nixpkgs/trunk/; revision=15783
2009-05-29 09:59:26 +00:00
Ludovic Courtès
fb087d2598 GNU Ed 1.3.
svn path=/nixpkgs/trunk/; revision=15698
2009-05-24 17:45:43 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Sander van der Burg
b430c032fd Fixed command-line argument support for Eclipse wrapper script
svn path=/nixpkgs/trunk/; revision=15591
2009-05-13 14:05:25 +00:00
Sander van der Burg
b506afc1a3 Added my own Eclipse expression which supports version 3.4 and provides a desktop item
svn path=/nixpkgs/trunk/; revision=15590
2009-05-13 13:55:53 +00:00
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