Commit graph

610 commits

Author SHA1 Message Date
Pascal Wittmann
296da4bfae Updating org-mode to 8.2.1 2013-10-01 15:52:31 +02:00
Song Wenwu
6ab7c495d5 add aseprite 0.9.5 2013-09-28 22:57:14 +08:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Vladimír Čunát
009780587f vim: add the missing patches
Somehow curl from github piped into git am didn't add them.
Sorry, I didn't notice. Thanks @shlevy.
2013-09-19 00:03:35 +02:00
Jason \"Don\" O'Conal
2eb384b982 vim_configurable: add patches to 7.4.23 (close #912) 2013-09-18 21:59:49 +02:00
Vladimír Čunát
d3c6bd45ca emacs24: fix license typo, change indentation
Note that the double-quote "indented strings" strip indentation,
so this ugly style was pointless.
2013-09-14 15:30:27 +02:00
Jason \"Don\" O'Conal
ad454f3511 emacs24: fix build on darwin (clos #932) 2013-09-14 15:19:54 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Rob Vermaas
691d143b29 Update sublime text to 2.0.2 2013-09-02 20:26:25 +02:00
Danie Roux
fcd9904be6 emacs24: Let -nox be a whole lot less X than it was
--with-x-toolkit=no still wants to -lX11 when checking for ncurses
2013-09-01 16:30:32 +02:00
Eelco Dolstra
8adb1d003e ed: Update to 1.9 2013-08-26 14:52:22 +02:00
Moritz Ulrich
a10812f792 Add emacs24-nox: emacs built without X (or GTK) libraries.
This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
2013-08-24 07:36:11 +03:00
Eelco Dolstra
7ac6b10446 emacs: Support building without GTK+ 2013-08-21 11:47:57 +02:00
Domen Kožar
7837b994bf fix eval 2013-08-21 01:23:40 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Song Wenwu
40cfa15513 add tiled-qt 0.9.1 2013-08-14 09:23:15 +08:00
Lluís Batlle i Rossell
2a444fbdee Marc Weber suggests to drop 'latest' in vim_configurable. 2013-08-13 17:52:07 +02:00
Lluís Batlle i Rossell
09e831e292 Updating vim and vim_configurable to 7.4.
I change vim_configurable from 'latest' to 'default', as 'default' now is more
recent than latest.
2013-08-13 17:47:27 +02:00
Justin Bedo
9ab74cd977 Add expression for flpsed 2013-08-13 08:20:08 +02:00
Joachim Schiele
6b1116cfce Merge branch 'dhex' 2013-07-31 15:21:54 +00:00
Joachim Schiele
afbc5cd5e9 added dhex, a nice ncurses based hex editor for the shell 2013-07-31 15:20:23 +00:00
Zef Hemel
b92b8dce05 MicroGNUEmacs, a.k.a. MG 2013-07-30 20:24:28 +02:00
Mathijs Kwik
9230619ee7 haskell-mode: upgrade to 13.07 2013-07-21 09:08:16 +02:00
Domen Kožar
ac1803f424 Merge pull request #747 from lovek323/vim-plugins-command-t
vim-plugins: add expression command-t
2013-07-14 23:04:33 -07:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Jason "Don" O'Conal
1d7d0addcc vim-plugins: add expression command-t
* also fix build of vim on darwin
2013-07-14 11:24:45 +10:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
5ae43d2494 Change more packages from direct downloads to mirror://sourceforge 2013-07-14 02:48:32 +03:00
Evgeny Egorochkin
aa85b80459 Change package urls to use mirror://sourceforge 2013-07-14 02:35:26 +03:00
Vladimír Čunát
355092dcdc kile: minor update 2013-07-05 14:45:58 +02:00
Jason "Don" O'Conal
72a771b6e4 emacs24: fix build on darwin 2013-07-03 19:57:38 +10:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Domen Kožar
5a0902456e Merge pull request #648 from lovek323/vim
vim_configurable: fix python on darwin
2013-06-20 23:19:51 -07:00
Evgeny Egorochkin
e77a7d21dc Fix attr name to match version 2013-06-19 05:15:05 +03:00
Jason "Don" O'Conal
719b488b10 vim_configurable: fix python on darwin
* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
2013-06-19 12:06:55 +10:00
Vladimír Čunát
f0417726d1 Merge pull request #533 from MarcWeber/submit/eclipses
eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more...
2013-06-18 14:20:10 -07:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Domen Kožar
0d15be335c Merge pull request #629 from lovek323/vim_configurable
vim_configurable: improvements
2013-06-15 10:36:51 -07:00
Peter Simons
38d22b4851 ess: add Emacs Speaks Statistics mode 2013-06-15 17:13:37 +02:00
Jason "Don" O'Conal
b7b98f04a2 vim_configurable: improvements
* add ruby interpreter (may have been accidentally removed, or may never
  have existed)
* allow selection of GUI options by setting `config.vim.gui`
2013-06-15 20:48:20 +10:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
6baad4d4d6 vim_configurable: fix compilation on darwin
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
2013-06-13 22:20:54 +10:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin
46cd2d0d68 Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins
vim: supporting multiple sources & complicated plugins
2013-06-10 23:06:56 -07:00
Michael Raskin
8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Christophe Raffalli
a69cd62f71 Added tuareg emacs mode and fixed some other emacs mode.
ecb emacs mode is commented out because it's dependency appears not to compile.
2013-06-08 12:42:46 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons
823765e305 haskell-mode: update to current version from git 2013-06-03 10:51:27 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Marc Weber
71628d6e35 vim: supporting multiple sources:
- vim-nox: client-server implementation without X
- latest:  latest mercurial sources (still very stable)
- default: latest release

vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
2013-05-27 22:26:29 +02:00
Marc Weber
93063dcf03 eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more declarative style (use getAttr in favour of if) 2013-05-16 09:59:26 +02:00
Peter Simons
3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00
Evgeny Egorochkin
f2f439a44b Eclipse: replace disappeared mirrors 2013-05-10 23:38:59 +03:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Marco Maggesi
d9aa18843b ProofGeneral: Workaround for bug #458
"ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90"
http://proofgeneral.inf.ed.ac.uk/trac/ticket/458
2013-04-23 14:09:10 +02:00
Mathijs Kwik
40502b492d magit: fix download url 2013-04-22 21:44:04 +02:00
Vladimír Čunát
3da96b38cd Merge pull request #465 from bjornfor/eclipse
eclipse: add Eclipse IDE for C/C++ Developers 4.2
2013-04-20 01:38:39 -07:00
Bjørn Forsman
07a71f7a1a eclipse: add Eclipse IDE for C/C++ Developers 4.2
If you upgrade from 3.7 you might get errors like these:

In the Package Explorer:
 Could not create the view: org.eclipse.jdt.ui

And some other stuff in the Error Log; "Unable to resolve plug-in [...]"

The solution is to delete your eclipse workspace (or just the hidden
setting files in there, if you have important user data).
2013-04-15 21:26:59 +02:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Peter Simons
84ff838780 emacs-prolog-mode: update to version 1.25 2013-04-12 21:33:37 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Vladimír Čunát
7c86a69b2a geany: fix build via a minor update 2013-04-11 19:28:21 +02:00
Peter Simons
f8faea23f8 emacs-cedet: update to version 1.1 to fix the build 2013-04-06 01:24:46 +02:00
Peter Simons
58211c125a Merge pull request #407 from maggesi/proofgeneral_updates
Update ProofGeneral to version 4.2
2013-03-25 03:33:21 -07:00
Marco Maggesi
7b35dcdc62 ProofGeneral: remove dead code (compatibility with emacs 23). 2013-03-24 23:43:18 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Mathijs Kwik
208a35558e emacs-w3m: upgrade to current cvs 2013-03-22 00:00:06 +01:00
Mathijs Kwik
b73b3c9d62 htmlize: upgrade to 1.47 2013-03-22 00:00:06 +01:00
Marco Maggesi
cd3caeaf8f Update ProofGeneral to version 4.2 2013-03-19 14:49:45 +01:00
Peter Simons
5186e75c4f emacs: update to version 24.3
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
2013-03-11 19:18:31 +01:00
Peter Simons
7165babaf1 Re-generate all Haskell packages with the latest version of cabal2nix.
This change brings support for building and running the regressions test suites.
2013-02-24 22:09:07 +01:00
Shea Levy
aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Song Wenwu
679150157b emacs: add "auto-complete-clang-async" mode (aka emacs-clang-complete-async) 2013-02-18 21:06:29 +08:00
Vladimír Čunát
19721fe792 vim: fix a typo from commit ab3eea 2013-02-05 17:51:30 +01:00
Eelco Dolstra
eeb116a2eb emacs-22: Remove 2013-01-29 11:39:38 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Mathijs Kwik
1f0a6fbf52 htmlize: upgrade to 1.43 2013-01-13 14:30:54 +01:00
Mathijs Kwik
4bd5a8e26d flymake-cursor: upgrade to 0.1.5 2013-01-13 14:30:54 +01:00
Mathijs Kwik
0890c45498 buildNativeInputs -> nativeBuildInputs 2013-01-13 11:33:45 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Ludovic Courtès
563416500e zile: remove `help2man' from the cross-build inputs 2013-01-07 17:37:51 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
85996ac018 ed: Update to 1.7 2012-12-12 17:17:05 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
aszlig
6acc5289fc
vbindiff: New package, version 3.0_beta4.
Visual binary differences viewer, very useful for reverse-engineering
proprieritary file formats.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Ludovic Courtès
2809f9bbce ed: disable tests on Darwin 2012-12-03 15:26:20 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Ludovic Courtès
310567b91f zile: update to 2.4.9 2012-11-29 10:07:21 +01:00
Baptist BENOIST
82bdf7c8d9 opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file
This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
It have no reasons to exist in a redistribuable package
2012-11-28 00:21:34 +01:00
Eelco Dolstra
148f8d2c21 nano: Update to 2.2.6
Also enable all features that were disabled (mouse support!).  This
adds a whopping 48 KB to the binary.
2012-11-23 16:41:42 +01:00
Eelco Dolstra
880ce8da2e nxml-mode: Remove
This package is now part of Emacs itself.
2012-11-23 11:10:30 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
26f32d8df6 Merge pull request #191 from qknight/gobby_update
updates to libinfinity 0.5.3 and gobby 0.4.94
2012-11-21 03:07:38 -08:00
Joachim Schiele
1ed9e35be6 fixed compile errors for libinfinity and gobby 2012-11-20 21:21:47 +00:00
Peter Simons
2f55f31f49 Merge pull request #155 from bbenoist/newpkgs
New pkgs: qtcreator fox xfe gmrun geany
2012-11-20 12:43:06 -08:00
Peter Simons
58b56c268b graphviz-dot-mode: add version 0.3.3 2012-11-16 18:59:18 +01:00