philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

523 commits

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