Commit Graph

7032 Commits

Author SHA1 Message Date
Peter Simons
fadf3e1f75 haskell-sendfile: updated to version 0.7.5
svn path=/nixpkgs/trunk/; revision=33029
2012-03-13 08:26:25 +00:00
Peter Simons
3b0c84f93f haskell-hashtables: updated to version 1.0.1.3
svn path=/nixpkgs/trunk/; revision=33028
2012-03-13 08:26:18 +00:00
Eelco Dolstra
891dd9121b * Undo accidental commit.
svn path=/nixpkgs/trunk/; revision=33021
2012-03-12 15:34:00 +00:00
Eelco Dolstra
29df27f469 * Fix some Hydra dependencies that broke due to the Perl upgrade.
svn path=/nixpkgs/trunk/; revision=33020
2012-03-12 15:31:14 +00:00
Peter Simons
dd90a8b709 haskell-cabal2nix: updated to version 1.28
svn path=/nixpkgs/trunk/; revision=33016
2012-03-12 14:15:14 +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
Lluís Batlle i Rossell
446b01489a Updating tcpdump and libpcap. I also remove a patch of libpcap I don't know
what's for. It builds and runs equally for me with or without it. I couldn't
find notes in svn log about it.


svn path=/nixpkgs/trunk/; revision=32996
2012-03-11 19:37:49 +00:00
Yury G. Kudryashov
eb81f33244 Remove zapping, zvbi and rte
Feel free to revert&fix compile if you need these packages.

svn path=/nixpkgs/trunk/; revision=32966
2012-03-09 20:16:02 +00:00
Yury G. Kudryashov
469d3f46be loudmouth: use mirror://gnome
svn path=/nixpkgs/trunk/; revision=32955
2012-03-09 15:09:11 +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
1f84acc113 gamin: glib-2.30.0 FTBFS
Cherry-pick ^/nixpkgs/branches/glib-2.30@31417

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32943
2012-03-09 07:13:03 +00:00
Yury G. Kudryashov
7331031c0c glib-networking-2.30.2
* Pass gsettings-desktop-schemas to glib-networking
* Use ca-certificates /etc/ca-bundle.crt

Cherry-pick ^/nixpkgs/branches/glib-2.30@31414, remove xz

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32942
2012-03-09 06:18:42 +00:00
Yury G. Kudryashov
dc4833f773 polkit-0.104
cherry-pick ^/nixpkgs/branches/glib-2.30@31425

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32941
2012-03-09 06:13:10 +00:00
Yury G. Kudryashov
a14e9f7c0f gtk+-2.24.10
svn path=/nixpkgs/trunk/; revision=32936
2012-03-08 23:29:27 +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
683752fa85 libgsf: pass gdk_pixbuf
svn path=/nixpkgs/trunk/; revision=32923
2012-03-08 22:45:35 +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
Yury G. Kudryashov
1a62d14cdd Move glib-networking to top namespace
svn path=/nixpkgs/trunk/; revision=32905
2012-03-08 16:49:08 +00:00
Lluís Batlle i Rossell
46b258acb4 Updating octave to the new major release 3.6.1
svn path=/nixpkgs/trunk/; revision=32904
2012-03-08 16:24:37 +00:00
Andres Löh
ec99325d80 Explicitly set platforms for 7.4.1 rather than inheriting them.
I hope this will enable darwin builds for 7.4.1 on Hydra.

svn path=/nixpkgs/trunk/; revision=32903
2012-03-08 16:22:01 +00:00
Lluís Batlle i Rossell
d2747b12e9 Updating and fixing physfs, so more videogames can build.
svn path=/nixpkgs/trunk/; revision=32891
2012-03-08 13:34:42 +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
Ludovic Courtès
66403757db GNU MPFR: Work around a FreeBSD bug.
svn path=/nixpkgs/trunk/; revision=32884
2012-03-08 11:12:15 +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
Yury G. Kudryashov
2a074000be patch and fixCmakeFiles do not commute
svn path=/nixpkgs/trunk/; revision=32876
2012-03-08 07:59:56 +00:00
Yury G. Kudryashov
3dde54caeb poppler-0.18.4
svn path=/nixpkgs/trunk/; revision=32875
2012-03-08 07:59:53 +00:00
Shea Levy
9eb1b81548 Update rubygems
svn path=/nixpkgs/trunk/; revision=32873
2012-03-08 05:45:23 +00:00
Lluís Batlle i Rossell
a51ca62215 Fixing the build of libwpd 0.8. That will help openoffice to go on building.
svn path=/nixpkgs/trunk/; revision=32871
2012-03-07 22:38:42 +00:00
Lluís Batlle i Rossell
02ac39aef8 Setting myself as maintainer for xsane and cdecl, and telling hydra to build them.
svn path=/nixpkgs/trunk/; revision=32868
2012-03-07 22:20:23 +00:00
Lluís Batlle i Rossell
f1f834f260 Adding patches for cdecl to build. I picked them from:
http://gentoo-overlays.zugaina.org/gentoo/portage/dev-util/cdecl/files/


svn path=/nixpkgs/trunk/; revision=32866
2012-03-07 22:12:12 +00:00
Ludovic Courtès
09531a24ad GCC 4.6: Fix `gccCrossStageFinal' for GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=32853
2012-03-07 16:01:07 +00:00
Lluís Batlle i Rossell
7f3aa94399 Fixing the build of opencascade on linux.
The new gcc sees a code flaw that I can 'overcome' (make the build go on) with -fpermissive.


svn path=/nixpkgs/trunk/; revision=32852
2012-03-07 13:49:51 +00:00
Ludovic Courtès
04e9081837 GNU libc: Reinstate the latest Hurd snapshot.
svn path=/nixpkgs/trunk/; revision=32850
2012-03-07 13:45:01 +00:00
Rob Vermaas
c4b2325838 update strategoxt
svn path=/nixpkgs/trunk/; revision=32849
2012-03-07 13:21:44 +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
Eelco Dolstra
6adea06e1c * Disable some broken jobs (http://hydra.nixos.org/build/2250730).
svn path=/nixpkgs/trunk/; revision=32846
2012-03-07 09:13:52 +00:00
Peter Simons
0005cc8e28 perl-Compress-Raw-Bzip2: updated to version 2.049 to (hopefully) fix test suite failures on Darwin
svn path=/nixpkgs/trunk/; revision=32843
2012-03-07 06:52:06 +00:00
Peter Simons
a919e1274f perl-Compress-Raw-Zlib: updated to version 2.051 to (hopefully) fix test suite failures on Darwin
svn path=/nixpkgs/trunk/; revision=32842
2012-03-07 06:52:02 +00:00
Peter Simons
c20062ea51 haskell-download-curl: updated to version 0.1.4
svn path=/nixpkgs/trunk/; revision=32841
2012-03-06 22:27:29 +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
Ludovic Courtès
8bab00e0ad GCC 4.6: Add patch to fix GNU/Hurd builds.
svn path=/nixpkgs/trunk/; revision=32837
2012-03-06 21:33:20 +00:00
Peter Simons
f750ad3871 nss: updated to version 3.13.3 to fix build errors on Linux 3.2
svn path=/nixpkgs/trunk/; revision=32834
2012-03-06 20:57:39 +00:00
Ludovic Courtès
0a08fe21f3 libgdiplus 2.10.9.
svn path=/nixpkgs/trunk/; revision=32833
2012-03-06 20:23:34 +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
3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons
453a3a7d39 haskell-xss-sanitize: updated to version 0.3.1.1
svn path=/nixpkgs/trunk/; revision=32817
2012-03-06 11:05:48 +00:00
Peter Simons
ae52511779 haskell-clientsession: updated to version 0.7.4.2
svn path=/nixpkgs/trunk/; revision=32816
2012-03-06 11:05:45 +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
Peter Simons
1f847aa4c5 haskell-Crypto: fix build on GHC 7.4.1
http://anonscm.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-crypto;a=filediff;h=20120213034652-b2814-0019a3f92e453e9be86166d6c1f1bc0dad6e4d12.gz;f=patches/class-constraints.diff

svn path=/nixpkgs/trunk/; revision=32808
2012-03-05 23:32:24 +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
6343fc34ec haskell-system-fileio: updated to version 0.3.7
svn path=/nixpkgs/trunk/; revision=32801
2012-03-05 17:52:30 +00:00
Peter Simons
d5b26ac52f haskell-happstack-server: updated to version 6.6.4
svn path=/nixpkgs/trunk/; revision=32800
2012-03-05 17:52:24 +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
edb8aaed92 exiv2-0.22
svn path=/nixpkgs/trunk/; revision=32796
2012-03-05 10:27:47 +00:00
Yury G. Kudryashov
8d784d0d1b libexif-0.6.20
svn path=/nixpkgs/trunk/; revision=32795
2012-03-05 10:27:44 +00:00
Yury G. Kudryashov
a28ca7b07f Remove unused patch no-po.patch
It is not used since rev 9722

svn path=/nixpkgs/trunk/; revision=32794
2012-03-05 10:27:40 +00:00
Yury G. Kudryashov
f99db36748 Remove unused patch
Ncurses does not reference this patch since r32728.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32793
2012-03-05 10:00:57 +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
Yury G. Kudryashov
7760d844ba soprano-2.7.5
svn path=/nixpkgs/trunk/; revision=32790
2012-03-05 05:10:10 +00:00
Mathijs Kwik
a92fe14103 upgraded nodejs to 0.6.11
svn path=/nixpkgs/trunk/; revision=32760
2012-03-04 12:28:45 +00:00
Yury G. Kudryashov
d4ffc7332c Merge trunk right before reintegrating
svn path=/nixpkgs/branches/libpng15/; revision=32758
2012-03-04 09:09:21 +00:00
Shea Levy
62a2b075e4 Update rubygems
svn path=/nixpkgs/trunk/; revision=32755
2012-03-03 17:32:11 +00:00
Lluís Batlle i Rossell
b479679b94 Fixing typos in the oprofile expression
svn path=/nixpkgs/trunk/; revision=32752
2012-03-03 12:15:58 +00:00
Lluís Batlle i Rossell
5a568ee185 Updating oprofile
svn path=/nixpkgs/trunk/; revision=32751
2012-03-03 11:30:44 +00:00
Ludovic Courtès
d8849a045e lcov: Fix build on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32746
2012-03-02 15:57:36 +00:00
Lluís Batlle i Rossell
55fb51c2d1 Updating opencascade to 6.5.2.
I had to bring an older ftgl in.


svn path=/nixpkgs/trunk/; revision=32742
2012-03-02 13:47:37 +00:00
Eelco Dolstra
a88fdf8ef7 * Oops.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32737
2012-03-02 09:35:51 +00:00
Peter Simons
6975b032b1 haskell-persistent-template: updated to version 0.8.1.2
svn path=/nixpkgs/trunk/; revision=32736
2012-03-02 08:46:43 +00:00
Peter Simons
dc74dd0cb0 haskell-math-functions: updated to version 0.1.1.1
svn path=/nixpkgs/trunk/; revision=32735
2012-03-02 08:46:38 +00:00
Eelco Dolstra
a753c4a170 * GCC 4.6.3 and 4.5.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32734
2012-03-01 23:15:21 +00:00
Eelco Dolstra
11d1104a88 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Ludovic Courtès
0b6223cff2 GNU Ncurses: Remove patch that no longer applies.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32728
2012-03-01 21:48:25 +00:00
Eelco Dolstra
148e234aab * Fix broken symlink.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32727
2012-03-01 21:40:46 +00:00
Ludovic Courtès
8ab088c668 libchop 0.5.2.
svn path=/nixpkgs/trunk/; revision=32726
2012-03-01 21:39:43 +00:00
Peter Simons
87f8280cc9 haskell-yesod: updated to version 0.10.1.3
svn path=/nixpkgs/trunk/; revision=32725
2012-03-01 20:19:46 +00:00
Ludovic Courtès
edfddd88b7 zlib: Add SourceForge mirror.
svn path=/nixpkgs/trunk/; revision=32721
2012-03-01 15:11:30 +00:00
Yury G. Kudryashov
84fb9ca331 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32719
2012-03-01 15:05:27 +00:00
Yury G. Kudryashov
92f1b06907 This is sha256, not md5
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
2012-03-01 07:19:01 +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
Peter Simons
41b3f46f78 haskell-yesod: updated to version 0.10.1.1
svn path=/nixpkgs/trunk/; revision=32710
2012-02-29 20:38:33 +00:00
Peter Simons
49a9e39593 haskell-gitit: updated to version 0.9
svn path=/nixpkgs/trunk/; revision=32709
2012-02-29 19:24:49 +00:00
Peter Simons
d18d66bd5f haskell-filestore: updated to version 0.4.1
svn path=/nixpkgs/trunk/; revision=32708
2012-02-29 19:24:47 +00:00
Peter Simons
81e6c12bb3 haskell-IfElse: added version 0.85
svn path=/nixpkgs/trunk/; revision=32707
2012-02-29 19:24:44 +00:00
Peter Simons
a631f6de6a haskell-utility-ht: updated to version 0.0.8
svn path=/nixpkgs/trunk/; revision=32706
2012-02-29 17:30:52 +00:00
Peter Simons
4fc8cd9777 haskell-testpack: updated to version 2.1.2
svn path=/nixpkgs/trunk/; revision=32705
2012-02-29 17:30:49 +00:00
Peter Simons
3c88baeec8 haskell-convertible: updated to version 1.0.11.1
svn path=/nixpkgs/trunk/; revision=32704
2012-02-29 17:30:47 +00:00
Peter Simons
31dc88f597 haskell-clientsession: updated to version 0.7.4.1
svn path=/nixpkgs/trunk/; revision=32703
2012-02-29 17:30:44 +00:00
Peter Simons
43153fa269 haskell-authenticate: updated to version 1.0.0.1
svn path=/nixpkgs/trunk/; revision=32702
2012-02-29 17:30:42 +00:00
Peter Simons
708e6f487d haskell-HSH: updated to version 2.0.4
svn path=/nixpkgs/trunk/; revision=32701
2012-02-29 17:30:39 +00:00
Peter Simons
5f4c5c106a haskell-stm: updated to version 2.3
svn path=/nixpkgs/trunk/; revision=32700
2012-02-29 17:24:31 +00:00
Peter Simons
ad4b594cce haskell-hxt: updated to version 9.2.2
svn path=/nixpkgs/trunk/; revision=32699
2012-02-29 17:24:27 +00:00
Eelco Dolstra
55ce36faee * Updated Leiningen to 1.7.0 (contributed by Phil Hagelberg; added a
call to patchShebangs to fix the reference to /bin/bash).

svn path=/nixpkgs/trunk/; revision=32698
2012-02-29 14:35:34 +00:00
Arie Middelkoop
d9f5e277a5 OCamlMakefile update.
svn path=/nixpkgs/trunk/; revision=32687
2012-02-29 12:51:06 +00:00
Lluís Batlle i Rossell
1ad3da0ca8 Taking back 32635. An older Rigs of Rods does not work better. Same throttle issues. Let's keep with 0.39.4.
svn path=/nixpkgs/trunk/; revision=32685
2012-02-28 23:01:25 +00:00
Karn Kallio
a70a76086c Latest version of libzip places zipconf.h where mysqlworkbench
cannot find it and so mysqlworkbench does not build.  This links
it to somewhere mysqlworkbench looks.

I think the openoffice build also failed because of this.

svn path=/nixpkgs/trunk/; revision=32679
2012-02-28 16:26:55 +00:00
Eelco Dolstra
b14a737a4d * Since we're rebuilding everything that depends on Python anyway, we
may as well update Python to the latest stable version.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32675
2012-02-28 11:09:36 +00:00
Florian Friesdorf
ff37a57373 Revert "remove empty readonly site-packages"
This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32674
2012-02-28 10:31:28 +00:00
Ludovic Courtès
026f6e7697 Doxygen: Reinstate version 1.7.
svn path=/nixpkgs/trunk/; revision=32672
2012-02-28 10:08:21 +00:00
Peter Simons
409e44cbe1 haskell-idris: updated to version 0.9.2
svn path=/nixpkgs/trunk/; revision=32671
2012-02-28 10:03:45 +00:00
Peter Simons
81b3becc7e haskell-epic: updated to version 0.9.3
svn path=/nixpkgs/trunk/; revision=32670
2012-02-28 10:03:40 +00:00
Peter Simons
de9ebc460c Added meta.maintainers section.
svn path=/nixpkgs/trunk/; revision=32669
2012-02-28 00:10:09 +00:00
Peter Simons
b2356973fe haskell-haskdogs: wrapper around hasktags that fetches sources for dependencies from hackage
svn path=/nixpkgs/trunk/; revision=32667
2012-02-28 00:10:02 +00:00
Peter Simons
bf4ebdc2bb haskell-HSH: shell scripting in haskell
svn path=/nixpkgs/trunk/; revision=32666
2012-02-28 00:09:59 +00:00
Peter Simons
be0acc8bc1 hasktags: ctags/etags for haskell sources
svn path=/nixpkgs/trunk/; revision=32665
2012-02-28 00:09:56 +00:00
Florian Friesdorf
962e6fb704 Revert "python site.py that loads pth files anywhere on PYTHONPATH"
This reverts commit fac80449abd57c271dfb98d392e49e4135dfc50c.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32663
2012-02-28 00:08:00 +00:00
Florian Friesdorf
833023d85a Revert "pth file with deps, only current package's scripts, no colliding files"
This reverts commit 3a37caa6a278fb244eac4a6bb1452d1914159be8.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32662
2012-02-28 00:07:56 +00:00
Florian Friesdorf
363579bc09 Revert "clean setuptools from colliding files - it is not using buildPythonPkg"
This reverts commit 9bc390eb7b9bcbe8b4951797010efd27afbe7afd.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32661
2012-02-28 00:07:53 +00:00
Florian Friesdorf
3b39dff906 Revert "include site for python wrappers to enable deps via pth files"
This reverts commit dca280ab0b668553c50506ab7b31284e8477a803.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32660
2012-02-28 00:07:48 +00:00
Florian Friesdorf
43e16d04b9 Revert "prevent distutils during module install from downloading and load pth files"
This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32659
2012-02-28 00:07:42 +00:00
Florian Friesdorf
9159a78807 Revert "insert pth eggs at index of site-packages they come from"
This reverts commit daa626efe76d8602c7892aaa338d526ea88bfe1b.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32658
2012-02-28 00:07:39 +00:00
Florian Friesdorf
e20d04408e Revert "meta for offline-distutils"
This reverts commit 8fcf025e5f80519a6f06c0b36aee007fe16a6e31.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32657
2012-02-28 00:07:36 +00:00
Florian Friesdorf
4956884de5 Revert "do not propagate makeWrapper via pythonXYFull"
This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32656
2012-02-28 00:07:33 +00:00
Florian Friesdorf
4b4f6ece3e Revert "removal of deps' scripts only if easy-install.pth exists"
This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32655
2012-02-28 00:07:30 +00:00
Florian Friesdorf
2d2c8b3e59 Revert "include site in pythonpath of wrapped scripts, if python-site is installed"
This reverts commit 1ac12b0d4b64936104cb6031b02c92c3d1845ae5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32654
2012-02-28 00:07:27 +00:00
Florian Friesdorf
bf1fe3aa09 Revert "pysite support for pythonXYFull wrapper"
This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32653
2012-02-28 00:07:23 +00:00
Florian Friesdorf
2ea5e2b576 Revert "suffix pythonpath"
This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32652
2012-02-28 00:07:19 +00:00
Florian Friesdorf
92da3fd865 Revert "PYTHONPATH in preConfigure instead of configurePhase"
This reverts commit a9873e9412d5ffb333baaf33502c8dff62548fa6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32651
2012-02-28 00:07:16 +00:00
Florian Friesdorf
c5a2f289f6 Revert "separate libxml2 python bindings, added libconvOrLibC dependency"
This reverts commit 614b18668433329cc5686c34b51a63e51c86c9f4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32650
2012-02-28 00:07:12 +00:00
Florian Friesdorf
e545a9944a Revert "added unzip to buildPythonPackage's buildInputs - used quite often"
This reverts commit f067ecb4911f154fe2c64434abdc5a8b79625f5a.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32644
2012-02-28 00:06:52 +00:00
Florian Friesdorf
178b5b9c5b Revert "move checkPhase after fixupPhase for python packages"
This reverts commit 413c44da228754018a2920cb556303e803a9d488.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32643
2012-02-28 00:06:49 +00:00
Florian Friesdorf
013c915777 Revert "enable preConfigure for python packages again"
This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32642
2012-02-28 00:06:46 +00:00
Florian Friesdorf
350edcbb9d include upstream patch for salsa validation with gcc4.6
http://sourceforge.net/apps/trac/cryptopp/changeset/529

svn path=/nixpkgs/branches/stdenv-updates/; revision=32638
2012-02-27 23:49:11 +00:00
Lluís Batlle i Rossell
11aceede25 Downgrading rigsofrods to a version that might work, where cars may run fast.
This rev should be very close to the stablest 0.38.

I had to bring an old angelscript in.


svn path=/nixpkgs/trunk/; revision=32635
2012-02-27 22:39:23 +00:00
Peter Simons
9e371a98c2 haskell-base64-bytestring: downgraded default version to 0.1.0.3
Michael Snoyman reports that version 0.1.1.0 has serious performance issues:

> import Data.ByteString.Base64
> import Data.ByteString.Char8 (pack)
> import Criterion.Main
>
> main :: IO ()
> main = defaultMain
>    [ bench "encode" $ whnf encode $ pack "qwerty"
>    ]

On version 0.1.0.3, this takes 229.4312 ns. On 0.1.1.0, it takes 3.556598 ms.
It looks like the problem is coming from the recent addition of URL encoding
(f1916d8a86).

svn path=/nixpkgs/trunk/; revision=32632
2012-02-27 20:27:41 +00:00
Ludovic Courtès
5afbf9075e GNU Guile 1.8: Build without `-Werror'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32631
2012-02-27 20:10:10 +00:00
Ludovic Courtès
9a42b0b52b GNU libc: Update the Hurd port.
svn path=/nixpkgs/trunk/; revision=32630
2012-02-27 18:28:29 +00:00
Florian Friesdorf
3c51235920 enable preConfigure for python packages again
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32626
2012-02-27 17:34:08 +00:00
Florian Friesdorf
d16a15c0a5 move checkPhase after fixupPhase for python packages
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32625
2012-02-27 17:34:02 +00:00
Florian Friesdorf
9e646d4689 added unzip to buildPythonPackage's buildInputs - used quite often
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32624
2012-02-27 17:33:55 +00:00
Ludovic Courtès
0400423fb1 GCC 4.6: Fix erroneous dependency on X libraries when !javaAwtGtk.
svn path=/nixpkgs/trunk/; revision=32620
2012-02-27 17:22:27 +00:00
Lluís Batlle i Rossell
49cb081019 Updating doxygen to 1.8.0
svn path=/nixpkgs/trunk/; revision=32619
2012-02-27 16:45:35 +00:00
Peter Simons
4c93fa4e47 haskell-persistent: updated to version 0.8.0.1
svn path=/nixpkgs/trunk/; revision=32616
2012-02-27 10:12:03 +00:00
Michael Raskin
c8dc35ac72 Trying to fix geoclue build with fresher GCC
svn path=/nixpkgs/branches/stdenv-updates/; revision=32614
2012-02-27 08:18:11 +00:00
Michael Raskin
4ff245c5de Add fresh cmake
svn path=/nixpkgs/trunk/; revision=32611
2012-02-27 06:22:47 +00:00
Lluís Batlle i Rossell
b2ff0f484e Blind commit trying to fix zziplib, with a little patch.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32607
2012-02-26 21:45:08 +00:00
Lluís Batlle i Rossell
e7c6623372 I think this may make irrlicht build, and thus, supertuxkart.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32605
2012-02-26 21:32:29 +00:00
Lluís Batlle i Rossell
bcbe60782b Trying to make qt3 build, with a patch related to the new gcc 4.6.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32604
2012-02-26 21:27:15 +00:00
Lluís Batlle i Rossell
7a5a0c24df Updating itk to 4.0.0, so they may also build in stdenv-updates.
svn path=/nixpkgs/trunk/; revision=32603
2012-02-26 21:23:59 +00:00
Lluís Batlle i Rossell
3d028687e9 I update krb5, so it may also build on stdenv-updates.
svn path=/nixpkgs/trunk/; revision=32600
2012-02-26 20:56:20 +00:00
Lluís Batlle i Rossell
cb5bbe00fe Adding the latest zlib, otherwise vlc does not build.
This also could be used for a newer cmake, or some trouble there was with libxml2.


svn path=/nixpkgs/trunk/; revision=32598
2012-02-26 20:06:01 +00:00
Florian Friesdorf
09cfb46f58 separate libxml2 python bindings, added libconvOrLibC dependency
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32596
2012-02-26 17:23:50 +00:00
Florian Friesdorf
6d7dfd1415 PYTHONPATH in preConfigure instead of configurePhase
enables a normal configurePhase also for python packages (e.g. libxml2
python bindings)

authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32595
2012-02-26 17:23:47 +00:00
Florian Friesdorf
eb35e3bd13 suffix pythonpath
this is already the case for the pythonXYFull

svn path=/nixpkgs/branches/stdenv-updates/; revision=32594
2012-02-26 17:23:44 +00:00
Florian Friesdorf
1d2e06e068 pysite support for pythonXYFull wrapper
svn path=/nixpkgs/branches/stdenv-updates/; revision=32593
2012-02-26 17:23:42 +00:00
Florian Friesdorf
d670c0e45c include site in pythonpath of wrapped scripts, if python-site is installed
svn path=/nixpkgs/branches/stdenv-updates/; revision=32592
2012-02-26 17:23:38 +00:00
Florian Friesdorf
c6893a14df removal of deps' scripts only if easy-install.pth exists
solves duplicate installation for packages that do not use setuptools

svn path=/nixpkgs/branches/stdenv-updates/; revision=32591
2012-02-26 17:23:35 +00:00
Florian Friesdorf
1c504b49b4 remove empty readonly site-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=32590
2012-02-26 17:23:31 +00:00
Florian Friesdorf
95f0b6119c do not propagate makeWrapper via pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32589
2012-02-26 17:23:28 +00:00
Florian Friesdorf
fe9d9530ba symlink python manpage for pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32588
2012-02-26 17:23:25 +00:00
Florian Friesdorf
09ae58fcd7 python wrapper comment
svn path=/nixpkgs/branches/stdenv-updates/; revision=32587
2012-02-26 17:23:22 +00:00
Florian Friesdorf
0f81888e09 meta for offline-distutils
svn path=/nixpkgs/branches/stdenv-updates/; revision=32586
2012-02-26 17:23:20 +00:00
Florian Friesdorf
8e32380a79 add PSFL, update python meta (license, maintainers, unify description)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
2012-02-26 17:23:16 +00:00
Florian Friesdorf
59d4678e83 insert pth eggs at index of site-packages they come from
thx Rok Garbas!

svn path=/nixpkgs/branches/stdenv-updates/; revision=32584
2012-02-26 17:23:13 +00:00
Florian Friesdorf
d52e2c7c41 prevent distutils during module install from downloading and load pth files
based on a patch by Cillian de Róiste

svn path=/nixpkgs/branches/stdenv-updates/; revision=32583
2012-02-26 17:23:09 +00:00
Florian Friesdorf
ccb34b093f include site for python wrappers to enable deps via pth files
svn path=/nixpkgs/branches/stdenv-updates/; revision=32582
2012-02-26 17:23:05 +00:00
Florian Friesdorf
8adcbec448 clean setuptools from colliding files - it is not using buildPythonPkg
svn path=/nixpkgs/branches/stdenv-updates/; revision=32581
2012-02-26 17:23:02 +00:00
Florian Friesdorf
6ccd671e5b pth file with deps, only current package's scripts, no colliding files
svn path=/nixpkgs/branches/stdenv-updates/; revision=32580
2012-02-26 17:22:59 +00:00
Florian Friesdorf
cb1009a3fb python site.py that loads pth files anywhere on PYTHONPATH
This file is normally created by easy_install / distutils, but removed
and packaged separately to avoid collisions and allow for more use cases.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32579
2012-02-26 17:22:55 +00:00
Florian Friesdorf
be815e7639 add an openssl mirror url as primary is currently down
svn path=/nixpkgs/branches/stdenv-updates/; revision=32578
2012-02-26 17:22:50 +00:00
Lluís Batlle i Rossell
183d05a0d7 Setting the cmake build type Release in its setup-hook, for all cmake
projects to be built in Release by default.

Some packages were not getting optimisation flags, like rigsofrods.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32574
2012-02-26 11:27:45 +00:00
Eelco Dolstra
a488f53a54 * Many buildr Buildfiles rely on RUBYLIB containing the current directory
(as was the default in Ruby < 1.9.2).  So make sure that's the case
  when running buildr.

svn path=/nixpkgs/trunk/; revision=32573
2012-02-26 11:10:00 +00:00
Eelco Dolstra
91e3d54b8f * Remove the ruby/default.nix, it's not very useful.
svn path=/nixpkgs/trunk/; revision=32572
2012-02-26 11:07:56 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Shea Levy
385f242a40 node.js: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32563
2012-02-25 19:36:24 +00:00
Peter Simons
9e7a5c5157 boost: updated to version 1.49
svn path=/nixpkgs/trunk/; revision=32562
2012-02-25 19:22:06 +00:00
Lluís Batlle i Rossell
675e16f805 Fixing jam for i686-linux. That should allow building trigger rally.
svn path=/nixpkgs/trunk/; revision=32557
2012-02-25 16:47:21 +00:00
Lluís Batlle i Rossell
bfd787a69a Finally I fix, not blindly, the nvidia-cg-toolkit expression for i686-linux
svn path=/nixpkgs/trunk/; revision=32554
2012-02-24 23:40:58 +00:00
Lluís Batlle i Rossell
d6f6caea6b Updating angelscript to 2.22.1.
Adding mysocketw.

Adding ogre-paged.

Fixing the caelum licence.


svn path=/nixpkgs/trunk/; revision=32549
2012-02-24 21:13:14 +00:00
Lluís Batlle i Rossell
0812ff0e57 Adding caelum (I want RoR)
svn path=/nixpkgs/trunk/; revision=32548
2012-02-24 20:34:35 +00:00
Lluís Batlle i Rossell
d1e84a7498 Blind commit trying to fix nvidia cg toolkit on i686-linux
svn path=/nixpkgs/trunk/; revision=32546
2012-02-24 20:18:32 +00:00
Peter Simons
7002f59751 haskell-warp: updated to version 1.1.0.1
svn path=/nixpkgs/trunk/; revision=32543
2012-02-24 11:38:59 +00:00
Peter Simons
c24800a05b haskell-wai: updated to version 1.1.0.1
svn path=/nixpkgs/trunk/; revision=32542
2012-02-24 11:38:57 +00:00
Peter Simons
557c02f29c haskell-wai-extra: updated to version 1.1.0.1
svn path=/nixpkgs/trunk/; revision=32541
2012-02-24 11:38:55 +00:00
Peter Simons
3eca3a2f17 haskell-wai-app-static: updated to version 1.1.2
svn path=/nixpkgs/trunk/; revision=32540
2012-02-24 11:38:52 +00:00
Peter Simons
4b3e14f5d0 Deleted deprecated packages:
haskell-containers-deepseq
  haskell-control-monad-attempt
  haskell-data-object
  haskell-data-object-yaml
  haskell-frown
  haskell-jsonEnumerator
  haskell-neither
  haskell-pool
  haskell-web-routes
  haskell-web-routes-quasi
  haskell-xml-enumerator

svn path=/nixpkgs/trunk/; revision=32538
2012-02-24 11:31:19 +00:00
Peter Simons
1df1758ca2 haskell-zlib-conduit: updated to version 0.2.0.1
svn path=/nixpkgs/trunk/; revision=32537
2012-02-24 11:31:16 +00:00
Peter Simons
e8ee9fa720 haskell-pandoc-types: updated to version 1.9.1
svn path=/nixpkgs/trunk/; revision=32536
2012-02-24 11:31:14 +00:00
Peter Simons
01efc84524 haskell-blaze-builder-conduit: updated to version 0.2.0.1
svn path=/nixpkgs/trunk/; revision=32535
2012-02-24 11:31:11 +00:00
Peter Simons
7c0fd3becc haskell-attoparsec-conduit: updated to version 0.2.0.1
svn path=/nixpkgs/trunk/; revision=32534
2012-02-24 11:31:08 +00:00
Peter Simons
9c06f2b68a haskell-monads-tf: added version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=32533
2012-02-24 08:24:12 +00:00
Yury G. Kudryashov
3652c61aed svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32522
2012-02-23 20:35:33 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
65e7aeda65 vala-0.14.2
svn path=/nixpkgs/trunk/; revision=32519
2012-02-23 19:59:22 +00:00
Peter Simons
222adc9fc3 haskell-funcmp: updated to version 1.6
svn path=/nixpkgs/trunk/; revision=32514
2012-02-23 16:08:57 +00:00
Peter Simons
5892f691dd haskell-cabal-file-th: updated to version 0.2.2
svn path=/nixpkgs/trunk/; revision=32513
2012-02-23 16:08:52 +00:00
Peter Simons
54939ca86c haskell-xml-conduit: updated to version 0.5.3
svn path=/nixpkgs/trunk/; revision=32510
2012-02-23 11:33:36 +00:00
Peter Simons
808df319a2 haskell-web-routes: updated to version 0.27.1
svn path=/nixpkgs/trunk/; revision=32509
2012-02-23 11:33:33 +00:00
Peter Simons
5232776a29 haskell-shakespeare-js: updated to version 0.11.1
svn path=/nixpkgs/trunk/; revision=32508
2012-02-23 11:33:31 +00:00
Peter Simons
be4b264bea haskell-shakespeare-css: updated to version 0.10.7.1
svn path=/nixpkgs/trunk/; revision=32507
2012-02-23 11:33:29 +00:00
Peter Simons
e321903ff1 Atlas aborts the build some kind of CPU frequency scaling is detected on the
build machine because that feature offsets the performance timings. We ignore
that check, however, because with binaries being pre-built on Hydra those
timings aren't accurate for the local machine in the first place. The build log
might show something such as the following:

 | It appears you have cpu throttling enabled, which makes timings
 | unreliable and an ATLAS install nonsensical.  Aborting.
 | See ATLAS/INSTALL.txt for further information
 | Ignoring CPU throttling by user override!

svn path=/nixpkgs/trunk/; revision=32506
2012-02-23 11:33:26 +00:00
Yury G. Kudryashov
166e87319c Fix cmake-2.6.4 build (add xmlrpc-c)
svn path=/nixpkgs/trunk/; revision=32505
2012-02-23 11:27:47 +00:00
Yury G. Kudryashov
417124626b Add cmake-2.6.4
This is the minimum version required for KDE-4, so I need it to ensure that my
cmake code works with cmake-2.6.4.

svn path=/nixpkgs/trunk/; revision=32504
2012-02-23 11:27:43 +00:00