Commit graph

6466 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 6bb466ed9b Making GPL Ghostscript use the system libraries (libjpeg, libpng, ...) so
the previous troubles with a mixture of libpng versions fade away.

I also enable back GPL Ghostscript as the default.

I checked that 'awesome' builds fine (it calls imagemagick for some pictures in
its build script), as a proof that imagemagick does not crash anymore.


svn path=/nixpkgs/trunk/; revision=32958
2012-03-09 17:15:11 +00:00
Lluís Batlle i Rossell 31cdac999c Reverting the set of GPL ghostscript as default, because it made imagemagick crash.
Eelco thinks it's about libpng versions mismatch.


svn path=/nixpkgs/trunk/; revision=32957
2012-03-09 16:40:20 +00:00
Lluís Batlle i Rossell ecb295e8c7 Setting GPL Ghostscript as default, instead of GNU ghostscript.
It looks like GPL Ghostscript has good support from upstream, and is more up to date,
in contrast to GNU's.


svn path=/nixpkgs/trunk/; revision=32953
2012-03-09 13:35:45 +00:00
Peter Simons 5b712643d9 swt: updated to version 3.7.2-201202080800
Committed on behalf of "Corey O'Connor" <coreyoconnor@gmail.com> via
<CANTmfBTtRRQoc9UXCmNC8z1BNhnmiQZNVhB1TNK-PUGV-9om_w@mail.gmail.com>.

svn path=/nixpkgs/trunk/; revision=32952
2012-03-09 13:24:16 +00:00
Peter Simons 178b500c8c Updated Haskell packages.
- Hipmunk: updated to version 5.2.0.7
 - cairo: updated to version 0.12.3
 - digest: updated to version 0.0.1.1
 - glib: updated to version 0.12.3
 - gloss: updated to version 1.6.2.1
 - gtk: updated to version 0.12.3
 - language-javascript: updated to version 0.4.10
 - pango: updated to version 0.12.3
 - zeromq-haskell: updated to version 0.8.4

svn path=/nixpkgs/trunk/; revision=32947
2012-03-09 10:01:19 +00:00
Yury G. Kudryashov b0aa85371b Use pango-1.29
svn path=/nixpkgs/trunk/; revision=32935
2012-03-08 23:25:52 +00:00
Yury G. Kudryashov b0dbd38ea6 Move libcroco and librsvg to top-level
svn path=/nixpkgs/trunk/; revision=32933
2012-03-08 22:57:05 +00:00
Yury G. Kudryashov 793d0c983c Move gsettings-desktop-schemas to data/misc
svn path=/nixpkgs/trunk/; revision=32929
2012-03-08 22:45:58 +00:00
Peter Simons 47e76fde88 haskell-unordered-containers: added version 0.1.4.6 again to fix build of snap-core
svn path=/nixpkgs/trunk/; revision=32911
2012-03-08 20:50:18 +00:00
Peter Simons 5ca8bc5be3 haskell-syb: revert removal of versions 0.2.2 and 0.3
Apparently, these versions weren't as obsolete as I thought.

svn path=/nixpkgs/trunk/; revision=32909
2012-03-08 18:53:51 +00:00
Michael Raskin 7c0d7abdd7 Adding GAP discrete algebra system
svn path=/nixpkgs/trunk/; revision=32908
2012-03-08 18:23:47 +00:00
Yury G. Kudryashov 1a62d14cdd Move glib-networking to top namespace
svn path=/nixpkgs/trunk/; revision=32905
2012-03-08 16:49:08 +00:00
Ludovic Courtès adb08e8a97 Add GCC 4.7.0 release candidate.
svn path=/nixpkgs/trunk/; revision=32898
2012-03-08 15:36:50 +00:00
Joachim Schiele dfbde3db02 updated springlobby to 141 and changed the name of the package
svn path=/nixpkgs/trunk/; revision=32896
2012-03-08 15:32:20 +00:00
Peter Simons 6443e4dc64 Updated haskell packages.
- uniplate: updated to version 1.6.7
 - unordered-containers: dropped obsolete version 0.1.4.6
 - HsOpenSSL: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=32889
2012-03-08 13:22:32 +00:00
Yury G. Kudryashov 9abf1b03a9 Move libgnome-keyring to development/libraries
svn path=/nixpkgs/trunk/; revision=32887
2012-03-08 13:06:44 +00:00
Eelco Dolstra 7cd2bdaa58 * Add x86_64-freebsd to release-lib.nix
svn path=/nixpkgs/trunk/; revision=32886
2012-03-08 12:52:00 +00:00
Lluís Batlle i Rossell f67cd2f0d7 Trying again to get perl510Packages for go_oo.
svn path=/nixpkgs/trunk/; revision=32885
2012-03-08 12:03:29 +00:00
Lluís Batlle i Rossell 7aa7245620 Trying to get go_oo pick perl510 packages for what it needs.
svn path=/nixpkgs/trunk/; revision=32882
2012-03-08 10:12:02 +00:00
Peter Simons 5e8842d808 haskell-mwc-random: updated to version 0.12.0.0
svn path=/nixpkgs/trunk/; revision=32880
2012-03-08 09:56:05 +00:00
Peter Simons d5eb6c7f59 haskell-unordered-containers: added version 0.2.0.0
svn path=/nixpkgs/trunk/; revision=32879
2012-03-08 09:56:00 +00:00
Lluís Batlle i Rossell bd86ae57c2 Setting perl 5.10 for the openoffice build. It uses Switch.pm.
svn path=/nixpkgs/trunk/; revision=32872
2012-03-07 22:41:33 +00:00
Lluís Batlle i Rossell dc0fd8219c I take back r32860; I'll try to fix libwpd_08
svn path=/nixpkgs/trunk/; revision=32870
2012-03-07 22:34:54 +00:00
Lluís Batlle i Rossell 18ddc5f25c A little patch to gav, and it does not require gcc 4.1 anymore.
svn path=/nixpkgs/trunk/; revision=32863
2012-03-07 22:04:53 +00:00
Lluís Batlle i Rossell 65f45ef322 Updating xsane, and making it build with the old libpng. The previous url is gone.
svn path=/nixpkgs/trunk/; revision=32862
2012-03-07 21:59:48 +00:00
Lluís Batlle i Rossell c62d643520 Let's see if go_oo will build without system libwpd. The libwpd required by oo.org fails to build.
svn path=/nixpkgs/trunk/; revision=32860
2012-03-07 21:48:26 +00:00
Lluís Batlle i Rossell 5335c6d816 Ouch, fixing my previous commit on xburst-tools.
svn path=/nixpkgs/trunk/; revision=32859
2012-03-07 21:40:43 +00:00
Ludovic Courtès 046743311d gcc_realCross: Switch to `gcc46_realCross'.
svn path=/nixpkgs/trunk/; revision=32854
2012-03-07 16:01:12 +00:00
Lluís Batlle i Rossell ef568bf192 Fixing the vxl build.
svn path=/nixpkgs/trunk/; revision=32848
2012-03-07 10:16:53 +00:00
Lluís Batlle i Rossell 5bd4e3d8f8 Setting glibc info and glibc locales for the glibc version we use (2.13).
svn path=/nixpkgs/trunk/; revision=32844
2012-03-07 08:18:00 +00:00
Peter Simons 4a39ac521a haskell-syb: removed obsolete versions 0.2.2 and 0.3
svn path=/nixpkgs/trunk/; revision=32840
2012-03-06 22:27:24 +00:00
Peter Simons 7873ce2793 pakcs: updated to version 1.10.0
svn path=/nixpkgs/trunk/; revision=32839
2012-03-06 22:27:20 +00:00
Peter Simons 4d752e1cd1 gfortran: updated default version to 4.6.3.
svn path=/nixpkgs/trunk/; revision=32838
2012-03-06 22:27:14 +00:00
Peter Simons d959dae915 perl-packages.nix: fixed test suite failures
- updated Encode to version 2.44
 - updated PerlMagick to version 6.74
 - updated YAML to version 0.80

svn path=/nixpkgs/trunk/; revision=32835
2012-03-06 21:13:41 +00:00
Yury G. Kudryashov 3fa0cbb011 zlib_latest == zlib, so remove zlib/latest.nix
svn path=/nixpkgs/trunk/; revision=32828
2012-03-06 14:35:37 +00:00
Yury G. Kudryashov 614d81046c Remove cmake_2_8_7: default is already 2.8.7
svn path=/nixpkgs/trunk/; revision=32827
2012-03-06 14:35:30 +00:00
Eelco Dolstra b49ee92aa9 * Fix building libgdiplus with libpng15.
svn path=/nixpkgs/trunk/; revision=32826
2012-03-06 13:49:37 +00:00
Eelco Dolstra 8778f0b368 * Change the priority of trunk builds back.
svn path=/nixpkgs/trunk/; revision=32823
2012-03-06 12:21:33 +00:00
Eelco Dolstra 3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons 10ec4c4a6a all-packages.nix: xsane doesn't depend on libpng
svn path=/nixpkgs/trunk/; revision=32818
2012-03-06 11:05:50 +00:00
Peter Simons 4adb9195bc haskell-base64-bytestring: updated to version 0.1.1.1
svn path=/nixpkgs/trunk/; revision=32815
2012-03-06 11:05:42 +00:00
Michael Raskin 20c29256cf xsane needs libpng12..
svn path=/nixpkgs/trunk/; revision=32813
2012-03-06 10:18:28 +00:00
Michael Raskin fd9fedc32a XaoS wants libpng12
svn path=/nixpkgs/trunk/; revision=32809
2012-03-06 09:28:08 +00:00
Yury G. Kudryashov b7642bfdfb svn merge ^/nixpkgs/trunk
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
2012-03-05 21:01:47 +00:00
Peter Simons 05d92999a0 Updated haskell packages.
- HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799
2012-03-05 11:58:21 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Ludovic Courtès e657e2c455 transfig: Keep using libpng 1.2.
svn path=/nixpkgs/trunk/; revision=32791
2012-03-05 09:40:36 +00:00
Mathijs Kwik b247fa9c2c chromium: depend on libpng12
svn path=/nixpkgs/trunk/; revision=32789
2012-03-04 22:47:52 +00:00
Eelco Dolstra 962b01f686 * Remove unnecessary copy on sed.
svn path=/nixpkgs/trunk/; revision=32773
2012-03-04 15:52:41 +00:00
Eelco Dolstra 27809f0ec4 * No longer needed.
svn path=/nixpkgs/trunk/; revision=32772
2012-03-04 15:50:03 +00:00