3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

566 commits

Author SHA1 Message Date
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  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
"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 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 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 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 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
Rob Vermaas dca0643b29 Make sublime work on 32bit linux. 2012-11-11 13:23:15 +01:00
Rob Vermaas aeb8d4c406 Oops, should have at least parsed the expression when committing before having had coffee... 2012-11-11 13:21:33 +01:00
Rob Vermaas 277bfc232b Sublime: add license attribute, and add assertion for i686-linux/x86_64-linux 2012-11-11 13:15:22 +01:00
Rob Vermaas ee142ea983 Add Sublime Text editor 2012-11-10 20:37:42 +01:00
Mathijs Kwik 320e0a46dc eclipse-sdk-4.2: upgrade to 4.2.1 2012-11-08 10:41:23 +01:00
Rob Vermaas b0cafe41ce Merge pull request from ecarreras/eclipse_icon
Put eclipse icon into share/pixmaps
2012-10-28 07:06:18 -07:00
Eduard Carreras 9acffb949d Change copy file to symbolic link 2012-10-17 14:16:23 +02:00
Eduard Carreras d22e3a02fd Put eclipse icon into share/pixmaps 2012-10-16 18:38:53 +02:00
Baptist BENOIST 51fe788417 Add geany-1.22
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
Geany only requires the GTK2 runtime libraries.

Some basic features of Geany:
 - Syntax highlighting
 - Code folding
 - Symbol name auto-completion
 - Construct completion/snippets
 - Auto-closing of XML and HTML tags
 - Call tips
 - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
 - Symbol lists
 - Code navigation
 - Build system to compile and execute your code
 - Simple project management
 - Plugin interface

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Peter Simons f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
Sander van der Burg b8e30a8af6 Changed the netbeans expression to use openjdk, which should work now 2012-10-11 10:31:42 +02:00
Peter Simons 6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Sander van der Burg 27cadaa404 Added package for netbeans IDE 2012-10-09 11:40:06 +02:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Peter Simons 964efb4adc magit: update to version 1.2.0 2012-09-24 13:25:19 +02:00
Eelco Dolstra 205e9235fc zile: Update to 2.4.8 and fix compilation
http://hydra.nixos.org/build/3052831
2012-09-21 13:43:56 -04:00
Eelco Dolstra e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Eelco Dolstra 6d3ce2e347 ed: Update to 1.6 2012-09-18 14:48:01 -04:00
aszlig b2392c09a0
aewan: New package, version 1.0.01.
This adds a small ASCII art drawing tool, which supports drawing with multiple
layers. Might be especially helpful for larger "images", which become quite
tedious to do using vim.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-14 23:24:10 +02:00
aszlig cb94852ae3
hexedit: New package, version 1.2.12.
A typical three-pane style hex editor, which is somewhat similar than bvi, but
smaller and without vi-like keybindings.

(Don't ask me why I use both, I just can't tell why I'm sometimes in bvi and
sometimes in hexedit mood... there simply is no rational explanation)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-14 23:24:10 +02:00
Mathijs Kwik da87b2c9bf emacs: add package "org2blog" 2012-09-09 19:32:27 +02:00
Mathijs Kwik 7bbda346ba emacs: add package "xml-rpc" 2012-09-09 19:32:14 +02:00
Mathijs Kwik 338e78c7b6 emacs htmlize: upgrade to 1.40 2012-09-09 19:31:54 +02:00
Mathijs Kwik 2b8d80d22d org-mode: upgrade to 7.9.1 2012-09-04 17:49:31 +02:00
Yury G. Kudryashov 096db8fe10 KDevelop-4.3.1 2012-08-31 12:20:09 +04:00
Mathijs Kwik 23f20dcdfe emacs/sunrise-commander: change to github source
previous source replaces itself every now and then and doesn't do versioning
2012-08-29 22:57:57 +02:00
Ludovic Courtès dc4cfe89ff emacs: Update to 24.2. 2012-08-27 18:16:06 +02:00
Mathijs Kwik a5663aee4d emacs: add "sunrise commander" 2012-08-21 10:33:20 +02:00
Mathijs Kwik 85c88d473b emacs: add "rect-mark" 2012-08-21 10:33:06 +02:00
Mathijs Kwik 5a146e9cff emacs: add "color-theme" 2012-08-17 08:55:47 +02:00
Mathijs Kwik 50cc5629af emacs: add "jade-mode" 2012-08-13 17:50:19 +02:00
Mathijs Kwik 58ccf70f47 it seems fetchgit does not like version tags
I think they built ok on my system before, because I nix-prefetch-git'd them.
2012-08-11 11:45:31 +02:00
Mathijs Kwik b62acd8855 oops typo 2012-08-11 11:34:59 +02:00
Mathijs Kwik a6f17bd1a9 emacs: add "flymake-cursor" 2012-08-11 09:36:20 +02:00
Mathijs Kwik 7fd5e6d668 emacs: upgrade "haskell-mode" to more recent git version 2012-08-10 08:27:09 +02:00
Mathijs Kwik c0a455b370 emacs: add "auto-complete" mode 2012-08-10 08:27:09 +02:00
Mathijs Kwik 260650e7e2 emacs: add "coffee-mode" 2012-08-10 08:27:09 +02:00
Mathijs Kwik d6befca296 emacs/js2-mode: upgrade 2012-08-10 08:27:09 +02:00
Shea Levy 988ef8acea Merge pull request from coreyoconnor/master
Adds Eclipse 4.2 to editors/eclipse
2012-08-06 13:27:06 -04:00
Mathijs Kwik a8be5de82e emacs: add lorem-ipsum package 2012-08-05 02:16:01 +02:00
Mathijs Kwik 56d30f72da emacs: add gist package 2012-08-05 02:15:48 +02:00
Mathijs Kwik ad5c002891 emacs: add gh (github) package 2012-08-05 02:15:34 +02:00
Mathijs Kwik 733b548cd0 emacs: add pcache package 2012-08-05 02:15:11 +02:00
Mathijs Kwik c700ec276d emacs: add logito package 2012-08-05 02:14:53 +02:00