JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,825 Commits 2 Branches 0 Tags 12 GiB
6eeb989a35
Commit Graph

656 Commits

Author SHA1 Message Date
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
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 #156 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 #85 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
Corey O'Connor
a79dd881c7 add eclipse 4.2 2012-08-04 11:14:02 -07:00
Shea Levy
5300731177 Joe: Bump to 3.7 2012-07-31 16:30:50 -04:00
Shea Levy
1a0baad6b2 Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh 2012-07-15 03:32:50 -04:00
Peter Simons
c5c98b7617 Updated Haskell packages. 
- derive: updated to version 2.5.9
 - ghc-mod: updated to version 1.11.0
 - hamlet: updated to version 1.0.1.4
 - http-conduit: updated to version 1.4.1.10
 - leksah: updated to version 0.12.1.3
 - mmap: updated to version 0.5.8
 - mtl: added version 2.1.2
 - prolog-graph-lib: updated to version 0.2.0.1
 - prolog: updated to version 0.2.0.1
 - reactive-banana-wx: updated to version 0.6.0.1
 - resourcet: updated to version 0.3.3
 - shelly: updated to version 0.12.0.2
 - simple-sendfile: updated to version 0.2.4
 - syb: added version 0.3.6.2
 - wai-app-static: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.3
 - warp: updated to version 1.2.2
 - xml-types: updated to version 0.3.2
 - zlib-conduit: updated to version 0.4.0.2
 2012-06-28 14:50:44 +02:00
Peter Simons
4490fe934e Updated Haskell packages. 
- base64-bytestring: updated to version 0.1.2.0
 - binary-shared: updated to version 0.8.2
 - bson: updated to version 0.2.1
 - leksah-server: updated to version 0.12.1.2
 - leksah: updated to version 0.12.1.2
 - MonadRandom: updated to version 0.1.7
 - random-shuffle: updated to version 0.0.4

svn path=/nixpkgs/trunk/; revision=34569
 2012-06-20 10:56:24 +00:00
Vladimír Čunát
cf2a383bc7 Hot-fixing kile's nl handbook compilation problem on KDE-4.7 by removing it. 
svn path=/nixpkgs/trunk/; revision=34568
 2012-06-20 09:11:58 +00:00
Vladimír Čunát
fc6ce9f799 Minor kile update. 
svn path=/nixpkgs/trunk/; revision=34554
 2012-06-18 20:18:09 +00:00
Karn Kallio
c89f37078d Make ProofGeneral build with Emacs 24. 
svn path=/nixpkgs/trunk/; revision=34485
 2012-06-12 21:51:53 +00:00
Florian Friesdorf
20db3374cf js2-mode-0-20120601 
svn path=/nixpkgs/trunk/; revision=34484
 2012-06-12 21:18:22 +00:00
Peter Simons
6ace4728f5 emacs-24: improved meta.description 
svn path=/nixpkgs/trunk/; revision=34477
 2012-06-12 12:18:12 +00:00
Peter Simons
b4ebc3bb42 emacs: version emacs-24.1 is out 
The 24.x version is still low-prio in nixpkgs until we've figured out how to
support multiple 'emacsPackages' sets properly.

svn path=/nixpkgs/trunk/; revision=34447
 2012-06-11 07:44:12 +00:00
Peter Simons
7d15ad90b9 Updated Haskell packages. 
- http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
 2012-06-05 08:31:42 +00:00
Peter Simons
68f07e270a magit: updated to version 1.1.1 
svn path=/nixpkgs/trunk/; revision=33866
 2012-04-20 22:37:30 +00:00
Ludovic Courtès
24feabdcec GNU Emacs 23.4. 
svn path=/nixpkgs/trunk/; revision=33698
 2012-04-09 20:51:04 +00:00
Ludovic Courtès
0e84e56083 GNU Zile 2.4.7. 
svn path=/nixpkgs/trunk/; revision=33695
 2012-04-09 20:50:50 +00:00
Yury G. Kudryashov
9105d0546d Drop old kdevplatform/kdevelop 
svn path=/nixpkgs/trunk/; revision=33571
 2012-04-04 16:14:57 +00:00
Peter Simons
880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use. 
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
 2012-03-24 10:21:28 +00:00
Peter Simons
e58d3914bb haskell-mode: updated to version 2.8.0.29-g7682f99 
svn path=/nixpkgs/trunk/; revision=33380
 2012-03-23 12:03:23 +00:00
Peter Simons
4f576ac4b5 pkgs/applications/editors/emacs-modes/haskell: updated haskell-mode to the latest version from Github 
svn path=/nixpkgs/trunk/; revision=33326
 2012-03-21 11:46:18 +00:00
Yury G. Kudryashov
102a1d82e7 Oops, fix kdevelop-4.3.0 hash 
svn path=/nixpkgs/trunk/; revision=33299
 2012-03-20 16:17:46 +00:00
Yury G. Kudryashov
34fcba81be Add new release of kdevelop 
I'll remove the old release when Hydra will build the new one, and I'll test the
result.

svn path=/nixpkgs/trunk/; revision=33296
 2012-03-20 14:12:53 +00:00
Peter Simons
c86a90c4e9 Updating Haskell packages. 
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
 2012-03-12 14:06:18 +00:00
Florian Friesdorf
7b47dea7b0 emacs-24.0.94 (pretest) 
svn path=/nixpkgs/trunk/; revision=32997
 2012-03-11 20:45:49 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Arie Middelkoop
6e8c9ea906 ocaml-mode for emacs. 
There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
 2012-02-29 12:53:13 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix. 
svn path=/nixpkgs/trunk/; revision=32292
 2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk 
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
 2012-02-10 10:24:30 +00:00
Peter Simons
4afaf0be23 emacs-w3m: updated the SHA256 hash 
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
 2012-02-07 17:45:47 +00:00
Florian Friesdorf
2f7102afc0 emacs 24.0.93 
svn path=/nixpkgs/trunk/; revision=32123
 2012-02-07 17:40:05 +00:00
Florian Friesdorf
df12f0bd01 emacs js2-mode 
svn path=/nixpkgs/trunk/; revision=32122
 2012-02-07 17:40:02 +00:00
Florian Friesdorf
f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode 
svn path=/nixpkgs/trunk/; revision=32119
 2012-02-07 17:39:54 +00:00
Florian Friesdorf
4e3afe1b8d emacs mode calfw-1.3 
svn path=/nixpkgs/trunk/; revision=32118
 2012-02-07 17:39:51 +00:00
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