Commit graph

433 commits

Author SHA1 Message Date
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