3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

651 commits

Author SHA1 Message Date
Eelco Dolstra e9f1c3abeb eclipse: Remove patchelf from the buildInputs 2014-01-14 13:51:17 +01:00
Nixpkgs Monitor 16cd5aba6a emacs24Packages.haskellMode: update from 13.07 to 13.10 2014-01-13 17:05:45 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Peter Simons 2f51f6908e yi: re-generate expression with cabal2nix 2014-01-11 12:03:41 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Benno Fünfstück eddb74a5cf New expressions: yi, yi contrib and dependencies 2014-01-08 19:11:33 +01:00
Mathijs Kwik 8fad5a72ec add emacs/idris-mode 2014-01-07 07:16:47 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Eelco Dolstra d150d49128 jedit: Fix build 2014-01-03 14:31:57 +01:00
Domen Kožar 3710322678 Merge pull request #1442 from ttuegel/vim
vim: enable support for Lua
2014-01-01 14:28:45 -08:00
Domen Kožar 28acbbef3a vim: ft-nix-support: update keywords, add builtins 2014-01-01 21:22:02 +01:00
Thomas Tuegel dd0f48ed98 vim: enable support for Lua 2014-01-01 09:30:57 -06:00
Michael Raskin e9ec56a596 Update vim_configurable to the same source tag as default vim 2013-12-29 19:38:43 +04:00
William A. Kennington III a2ff906257 vim: Update from 7.4.23 -> 7.4.131
Instead of applying all of the patches, this build pulls an archive from
the source code repo with all of the patches already applied. This is the
preferred way from http://www.vim.org/sources.php
2013-12-29 07:51:58 -06:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Edward Tjörnhammar 01c39bdefc Adding IntelliJ IDEA13 Community and Ultimate 2013-12-26 00:12:19 +01:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Peter Simons 778a55d352 ess-mode: enable Hydra builds on Linux 2013-12-21 00:05:29 +01:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor 873c95ba8d hexedit: update from 1.2.12 to 1.2.13 2013-12-15 13:00:22 +02:00
Nixpkgs Monitor 71d1e429a7 nano: update from 2.2.6 to 2.3.2 2013-12-14 17:59:57 +02:00
Nixpkgs Monitor c8f28ec7e3 geany: update from 1.23 to 1.23.1 2013-12-12 03:11:34 +02:00
Nixpkgs Monitor b95f7102ee flpsed: update from 0.7.0 to 0.7.1 2013-12-12 03:11:33 +02:00
Vladimír Čunát c11747b3f5 merge #1197: gnuplot darwin changes 2013-12-10 12:46:45 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons 1a996759a5 ess-mode: update to version 13.09 2013-12-03 12:44:52 +01:00
Rok Garbas f685b08d0d emacs offlineimap mode added 2013-11-12 11:00:58 +01:00
Eric Kow 9a97b842c5 Emacs darwin: avoid X unless explictly requested
This keeps the dependencies lighter. Perhaps future work on this
derivation could enable the Cocoa interface by default on Mac.
2013-11-10 13:41:10 +00:00
Sergey Mironov 2b1b4f3d3a qvim: chage platforms from 'unix' to 'linux'
I have no Darwin machine available so lets test qvim on Linux for now
2013-11-08 12:24:51 +04:00
Sergey Mironov c8bb648f0f qvim: clean up the code 2013-11-06 11:27:06 +04:00
Sergey Mironov d6d2de4147 Add qvim - an experimental Qt gui for Vim
vim-qt has the most complete set of Ctrl-Alt-Meta binding functionality.
For example, qvim is able to correctly bind keys like Alt-<nonlatin>.
More: https://bitbucket.org/equalsraf/vim-qt/wiki/Features
2013-11-04 23:02:54 +04:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Benno Fünfstück 351c9e310d Emacs: Fix TRAMP by adjusting its path so that it finds ls and other binaries on NixOS systems
Close #1094.
2013-10-22 09:56:43 +03:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Karn Kallio c51e6c75a6 eclipse: add Eclipse Classic version 4.3.1 (codename Kepler). 2013-10-11 22:25:58 +02:00
Eelco Dolstra 2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Mathijs Kwik 4d32a074a2 org-mode: install to proper dir 2013-10-04 09:07:45 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
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