Commit Graph

17685 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
Yury G. Kudryashov
8c1f88549d fontforge-20100222
svn path=/nixpkgs/trunk/; revision=31902
2012-01-28 09:04:48 +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
999502f95c haskell-zlib-bindings: updated to version 0.0.3
svn path=/nixpkgs/trunk/; revision=31900
2012-01-27 20:31:20 +00:00
Peter Simons
fb5c1e0687 haskell-test-framework: updated to version 0.4.2.1
svn path=/nixpkgs/trunk/; revision=31899
2012-01-27 20:31:17 +00:00
Peter Simons
8cc520bd88 haskell-test-framework-quickcheck2: updated to version 0.2.12
svn path=/nixpkgs/trunk/; revision=31898
2012-01-27 20:31:15 +00:00
Peter Simons
2be13ee004 haskell-test-framework-quickcheck: updated to version 0.2.8
svn path=/nixpkgs/trunk/; revision=31897
2012-01-27 20:31:12 +00:00
Peter Simons
45312449cc haskell-test-framework-hunit: updated to version 0.2.7
svn path=/nixpkgs/trunk/; revision=31896
2012-01-27 20:31:09 +00:00
Peter Simons
c3883364c6 haskell-ansi-wl-pprint: updated to version 0.6.4
svn path=/nixpkgs/trunk/; revision=31895
2012-01-27 20:31:06 +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
afc0aea6d1 kalzium: patch pushed upstream
svn path=/nixpkgs/trunk/; revision=31886
2012-01-27 16:31:54 +00:00
Lluís Batlle i Rossell
3c5fee5243 I revert the previous change to libreoffice.
svn path=/nixpkgs/trunk/; revision=31885
2012-01-27 15:14:29 +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
84b0c3de57 libharu: fix build with libpng15 (upstream patches)
svn path=/nixpkgs/branches/libpng15/; revision=31882
2012-01-27 15:05:35 +00:00
Ludovic Courtès
41445f89c3 TeXLive/ModernCV: Fix source hash.
svn path=/nixpkgs/trunk/; revision=31881
2012-01-27 14:40:58 +00:00
Eelco Dolstra
26bcec3897 * Bump nixUnstable.
svn path=/nixpkgs/trunk/; revision=31880
2012-01-27 13:39:47 +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
Ludovic Courtès
b793816a34 hwloc 1.4.
svn path=/nixpkgs/trunk/; revision=31877
2012-01-27 11:03:20 +00:00
Yury G. Kudryashov
fdae7ad9f4 Pass stable/unstable to l10n
svn path=/nixpkgs/trunk/; revision=31876
2012-01-27 10:03:32 +00:00
Michael Raskin
345da504ea Update SBCL
svn path=/nixpkgs/trunk/; revision=31875
2012-01-27 07:26:21 +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
Arie Middelkoop
7c8ab92620 kwooty expression: slight improvement of the build inputs.
svn path=/nixpkgs/trunk/; revision=31873
2012-01-26 23:24:40 +00:00
Arie Middelkoop
2782836036 Bluetooth driver version bumb.
The previous version gave a runtime error. Perhaps this one works better...

svn path=/nixpkgs/trunk/; revision=31872
2012-01-26 23:23:32 +00:00
Yury G. Kudryashov
94372bc342 akonadi-1.7.0
svn path=/nixpkgs/trunk/; revision=31871
2012-01-26 20:07:54 +00:00
Michael Raskin
393f2479f8 Fix mismatch...
svn path=/nixpkgs/trunk/; revision=31870
2012-01-26 19:39:45 +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
Michael Raskin
9f2be8d6b1 Update GLEW
svn path=/nixpkgs/trunk/; revision=31867
2012-01-26 18:04:02 +00:00
Sander van der Burg
4d266a5f56 Upgraded smack library to version 3.2.1
svn path=/nixpkgs/trunk/; revision=31865
2012-01-26 16:05:17 +00:00
Peter Simons
d9de74edd6 haskell-hlint: updated to version 1.8.21
svn path=/nixpkgs/trunk/; revision=31862
2012-01-26 14:20:27 +00:00
Peter Simons
bc7b6215eb haskell-pool: updated to version 0.1.2.1
svn path=/nixpkgs/trunk/; revision=31861
2012-01-26 14:20:25 +00:00
Peter Simons
e63055f4de haskell-hakyll: updated to version 3.2.5.0
svn path=/nixpkgs/trunk/; revision=31860
2012-01-26 14:20:22 +00:00
Peter Simons
77b74105f6 haskell-fclabels: updated to version 1.1.0.2
svn path=/nixpkgs/trunk/; revision=31859
2012-01-26 14:20:20 +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
Shea Levy
df587970ce rubygems: bump
svn path=/nixpkgs/trunk/; revision=31853
2012-01-26 13:39:31 +00:00