Commit graph

6097 commits

Author SHA1 Message Date
Yury G. Kudryashov 5ec7aa7e71 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31911
2012-01-28 19:32:28 +00:00
Yury G. Kudryashov 4b36b6132f Introduce libiconvOrNull and libiconvOrGlibc
One can use these attrs instead of custom 'if ... then libiconv else null'.
This way we can maintain the correct 'if ... then' check in one place.

NB: I don't know what is the correct condition, so I use stdenv.isLinux. Feel
free to fix this.

svn path=/nixpkgs/trunk/; revision=31906
2012-01-28 12:44:42 +00:00
Yury G. Kudryashov 491316794c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31905
2012-01-28 12:29:35 +00:00
Peter Simons 7d9442e2c3 Removed obsolete comment.
svn path=/nixpkgs/trunk/; revision=31904
2012-01-28 10:20:57 +00:00
Peter Simons 37d2e2e917 gmp: renamed nix files to conform with coding guidelines
svn path=/nixpkgs/trunk/; revision=31903
2012-01-28 10:20:50 +00:00
Lluís Batlle i Rossell 415b2bb145 Adding cppnetlib 0.9.2. The last I found in their github.
svn path=/nixpkgs/trunk/; revision=31901
2012-01-27 20:40:44 +00:00
Peter Simons 47c3e4b2a3 haskell-zlib: added version 0.5.3.2
This version is disabled for all versions of GHC older than 7.2, because
it won't build. Upstream has been notified.

svn path=/nixpkgs/trunk/; revision=31894
2012-01-27 20:31:03 +00:00
Peter Simons bbe935774d haskell-GLFW: added version 0.5.0.1
svn path=/nixpkgs/trunk/; revision=31893
2012-01-27 20:31:00 +00:00
Yury G. Kudryashov 7055c35293 Pass libpng12 to imlib
svn path=/nixpkgs/branches/libpng15/; revision=31892
2012-01-27 20:06:42 +00:00
Yury G. Kudryashov e9e0418145 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31891
2012-01-27 18:57:35 +00:00
Yury G. Kudryashov ed92080b8d icewm-1.3.7
svn path=/nixpkgs/trunk/; revision=31890
2012-01-27 18:56:31 +00:00
Yury G. Kudryashov 83d4b462fe More 'libpng = libpng12'
svn path=/nixpkgs/branches/libpng15/; revision=31889
2012-01-27 17:55:41 +00:00
Yury G. Kudryashov e155073b2c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31888
2012-01-27 17:49:20 +00:00
Yury G. Kudryashov 5408f303bd Pass libpng12 to webkit
svn path=/nixpkgs/branches/libpng15/; revision=31884
2012-01-27 15:12:59 +00:00
Lluís Batlle i Rossell 29ca4d272f Updating gdb. I did not update the 'bleeding edge' thing though. That should be
better named to "one git checkout" instead of bleeding edge.


svn path=/nixpkgs/trunk/; revision=31883
2012-01-27 15:11:17 +00:00
Yury G. Kudryashov 38b10c30a1 Pass libpng12 to exult
svn path=/nixpkgs/branches/libpng15/; revision=31879
2012-01-27 11:57:20 +00:00
Arie Middelkoop c4fdb28b80 Stable kernel 3.2.2 released today.
svn path=/nixpkgs/trunk/; revision=31874
2012-01-26 23:25:39 +00:00
Michael Raskin 51634c2137 Adding OpenSCAD - a 3D geometry interpreter
svn path=/nixpkgs/trunk/; revision=31869
2012-01-26 19:01:38 +00:00
Michael Raskin 53bcb2094f Adding CGAL: Computational Geometry Algorithms Library
svn path=/nixpkgs/trunk/; revision=31868
2012-01-26 18:28:53 +00:00
Peter Simons a5d419ea5a haskell-resource-pool: added version 0.2.1.0
svn path=/nixpkgs/trunk/; revision=31858
2012-01-26 14:20:17 +00:00
Peter Simons b968c011c6 haskell-pool-conduit: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31857
2012-01-26 14:20:14 +00:00
Peter Simons 4752d7201c haskell-ghc-mod: don't hard-code a specific version of emacsPackages into the expression itself
Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.

Also updated the meta section.

svn path=/nixpkgs/trunk/; revision=31856
2012-01-26 14:20:11 +00:00
Peter Simons adc8828c96 development/tools/parsing/ebnf2ps: added initial version 1.0.8
svn path=/nixpkgs/trunk/; revision=31855
2012-01-26 14:20:06 +00:00
Sander van der Burg b54d8fc58d Updated ejabberd to version 2.1.10
svn path=/nixpkgs/trunk/; revision=31854
2012-01-26 13:57:57 +00:00
Michael Raskin b9916f0fd9 Add K3D 3D editor
svn path=/nixpkgs/trunk/; revision=31850
2012-01-26 13:12:36 +00:00
Yury G. Kudryashov 2ced89b7f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
2012-01-26 08:45:19 +00:00
Yury G. Kudryashov eb59b98c26 vlc-1.1.13
svn path=/nixpkgs/trunk/; revision=31843
2012-01-26 08:36:18 +00:00
Arie Middelkoop 62e9429908 Added the 'bbswitch' module, which is a more conventient module for powering off/on nvidia graphics cards than possible via the acpi_call module.
svn path=/nixpkgs/trunk/; revision=31840
2012-01-26 01:02:22 +00:00
Lluís Batlle i Rossell 06548b79e9 Adding what I have for today of libreoffice. It still does not build.
svn path=/nixpkgs/trunk/; revision=31839
2012-01-25 23:04:34 +00:00
Peter Simons db98fa936b astyle: added initial version 2.02.1
svn path=/nixpkgs/trunk/; revision=31835
2012-01-25 13:52:18 +00:00
Yury G. Kudryashov 390f8aa954 Pass libpng12 to tetex
svn path=/nixpkgs/branches/libpng15/; revision=31831
2012-01-24 22:22:10 +00:00
Arie Middelkoop f9fabb4626 added kwooty: a binary newsreader (kde).
svn path=/nixpkgs/trunk/; revision=31829
2012-01-24 22:09:17 +00:00
Peter Simons ea9708ca01 haskell-mwc-random: added version 0.11.0.0
svn path=/nixpkgs/trunk/; revision=31807
2012-01-24 15:06:00 +00:00
Peter Simons 5f7e961d15 haskell-HsOpenSSL: added version 0.10.1.2
svn path=/nixpkgs/trunk/; revision=31806
2012-01-24 15:05:57 +00:00
Peter Simons 9e5c06adc9 haskell-language-javascript: updated to version 0.4.6
svn path=/nixpkgs/trunk/; revision=31805
2012-01-24 15:05:54 +00:00
Peter Simons 76cbc8ade8 haskell-text: added version 0.11.1.13
svn path=/nixpkgs/trunk/; revision=31804
2012-01-24 15:05:51 +00:00
Ludovic Courtès b479c4b172 GCC 4.5.1: Add `gcc45_debug'.
svn path=/nixpkgs/trunk/; revision=31803
2012-01-24 14:56:41 +00:00
Karn Kallio 39206f5b44 Get psi to compile with kde47 and kde48.
svn path=/nixpkgs/trunk/; revision=31799
2012-01-24 00:00:34 +00:00
Karn Kallio 05bbc5edd5 ProofGeneral documentation does not build without cm-super fonts.
svn path=/nixpkgs/trunk/; revision=31797
2012-01-23 19:03:41 +00:00
Andres Löh bbc726c86a Adding haskell-DSH and dependencies.
svn path=/nixpkgs/trunk/; revision=31794
2012-01-23 16:22:34 +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 cf287936ac ledger: renamed 2.6.3 version's nix file for consistency
svn path=/nixpkgs/trunk/; revision=31780
2012-01-21 19:25:41 +00:00
Peter Simons 40656ea5d1 mercurial: remove obsolete 'getConfig' mechanism to enable/disable GUI in favor of override
svn path=/nixpkgs/trunk/; revision=31778
2012-01-21 19:08:58 +00:00
Peter Simons 3c733ba49f all-packages.nix: provide mercurialFull package that comes with GUI front-end
This version preferred in user profiles, but not by packages that refer
to mercurial by attribute name.

svn path=/nixpkgs/trunk/; revision=31777
2012-01-21 19:08:56 +00:00
Peter Simons a118bc809e all-packages.nix: removed comment which I believe to be obsolete
svn path=/nixpkgs/trunk/; revision=31776
2012-01-21 19:08:52 +00:00
Peter Simons 58b19bd365 all-packages.nix: removed notmuchGit attribute to fix "nix-env -u \*"
The corresponding expression is missing.

svn path=/nixpkgs/trunk/; revision=31774
2012-01-21 18:55:22 +00:00
Florian Friesdorf 364f1ce3f7 notmuch as emacsPackage and top-level without emacs support
svn path=/nixpkgs/trunk/; revision=31768
2012-01-21 18:29:14 +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
Lluís Batlle i Rossell a4c35d0393 I made the use of ccacheWrapper somewhat easier.
svn path=/nixpkgs/trunk/; revision=31756
2012-01-21 11:22:13 +00:00