swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
18895 commits 5 branches 0 tags 27 GiB
Commit graph

18624 commits

Author SHA1 Message Date
Eelco Dolstra d1cbcc3971 * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=32965
 2012-03-09 19:57:33 +00:00
Yury G. Kudryashov 93683bf273 networkmanagement-0.9.0 
svn path=/nixpkgs/trunk/; revision=32964
 2012-03-09 19:34:10 +00:00
Eelco Dolstra 6bc6c61f01 * hdparm updated to 9.39. 
svn path=/nixpkgs/trunk/; revision=32963
 2012-03-09 19:24:54 +00:00
Joachim Schiele 92c04c80c7 tvtime is now on nixos, thanks to the patches taken from the portage team! 
svn path=/nixpkgs/trunk/; revision=32962
 2012-03-09 18:21:10 +00:00
Lluís Batlle i Rossell d6ae44060b Giving libusb1 to xbursttools. It wants it. 
svn path=/nixpkgs/trunk/; revision=32959
 2012-03-09 17:23:32 +00:00
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
Yury G. Kudryashov 469d3f46be loudmouth: use mirror://gnome 
svn path=/nixpkgs/trunk/; revision=32955
 2012-03-09 15:09:11 +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 a98e6bdc29 pdf-filter.nix: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=32950
 2012-03-09 10:22:34 +00:00
Peter Simons 70fca00b78 cups-pdf-filter: register MIME conversions from PDF to PS 
CUPS 1.5.x doesn't do that automatically anymore.

svn path=/nixpkgs/trunk/; revision=32949
 2012-03-09 10:22:30 +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
Joachim Schiele ac9f3a50a2 package won't build on the current nixos/nixpkgs (but it did with older checkouts on my other computer). so here is a fix which makes springlobby compile and install at least 
svn path=/nixpkgs/trunk/; revision=32937
 2012-03-09 00:59:13 +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 a5eb37cc37 gnome-doc-utils-0.18.1 
svn path=/nixpkgs/trunk/; revision=32934
 2012-03-08 23:15:51 +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 01c4e30a8a gnome-control-center-2.32.1 
svn path=/nixpkgs/trunk/; revision=32932
 2012-03-08 22:46:10 +00:00
Yury G. Kudryashov 711fada6ee gnome-settings-daemon-2.32.1 
svn path=/nixpkgs/trunk/; revision=32931
 2012-03-08 22:46:06 +00:00
Yury G. Kudryashov 86080768f1 metacity-2.30.3 
svn path=/nixpkgs/trunk/; revision=32930
 2012-03-08 22:46:03 +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
Yury G. Kudryashov ec84a1f0b8 libcroco-0.6.4 
svn path=/nixpkgs/trunk/; revision=32928
 2012-03-08 22:45:54 +00:00
Yury G. Kudryashov b196e5f125 libgnomekbd-2.32.0 
svn path=/nixpkgs/trunk/; revision=32927
 2012-03-08 22:45:51 +00:00
Yury G. Kudryashov c3eb93ae3b gnome-panel-2.32.1 
svn path=/nixpkgs/trunk/; revision=32926
 2012-03-08 22:45:47 +00:00
Yury G. Kudryashov 3372c8abfd librsvg-2.34.2 
svn path=/nixpkgs/trunk/; revision=32925
 2012-03-08 22:45:42 +00:00
Yury G. Kudryashov 396fcedaed libwnck-2.30.7 
svn path=/nixpkgs/trunk/; revision=32924
 2012-03-08 22:45:38 +00:00
Yury G. Kudryashov 683752fa85 libgsf: pass gdk_pixbuf 
svn path=/nixpkgs/trunk/; revision=32923
 2012-03-08 22:45:35 +00:00
Yury G. Kudryashov a85944b665 gnome-desktop-2.32.1 
svn path=/nixpkgs/trunk/; revision=32922
 2012-03-08 22:45:32 +00:00
Yury G. Kudryashov cfe4427418 gnome-session-2.32.1 
svn path=/nixpkgs/trunk/; revision=32921
 2012-03-08 22:45:28 +00:00
Yury G. Kudryashov dff711a9db GConf: depend on gtk 
It needs gtk only for 'gtk-sanity-check-2' program. We should split this program
to a dedicated package.

svn path=/nixpkgs/trunk/; revision=32920
 2012-03-08 22:45:25 +00:00
Yury G. Kudryashov 9a4c1acfb5 GConf-2.32.4 
svn path=/nixpkgs/trunk/; revision=32919
 2012-03-08 22:45:22 +00:00
Yury G. Kudryashov b409732c69 gnome-menus-2.30.5 
svn path=/nixpkgs/trunk/; revision=32918
 2012-03-08 22:45:18 +00:00
Yury G. Kudryashov 9fb93537bb zenity-2.32.1, remove CPPFLAGS magic 
svn path=/nixpkgs/trunk/; revision=32917
 2012-03-08 22:45:15 +00:00
Yury G. Kudryashov e7e3a28ac6 gnome-vfs-monikers: cleanup CPPFLAGS 
svn path=/nixpkgs/trunk/; revision=32916
 2012-03-08 22:45:11 +00:00
Yury G. Kudryashov 5d42d15d15 at-spi-1.32.0 
svn path=/nixpkgs/trunk/; revision=32915
 2012-03-08 22:45:02 +00:00
Lluís Batlle i Rossell e277e44e34 Updating GPL Ghostscript. 
svn path=/nixpkgs/trunk/; revision=32914
 2012-03-08 22:28:26 +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 b88e0e8807 libgnomeui depends on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32907
 2012-03-08 17:16:04 +00:00
Yury G. Kudryashov b94c51c2f7 gnome-keyring -> libgnome-keyring 
svn path=/nixpkgs/trunk/; revision=32906
 2012-03-08 16:49:14 +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
Yury G. Kudryashov 065d71635d gnome-icon-theme-2.30.3 
svn path=/nixpkgs/trunk/; revision=32900
 2012-03-08 15:37:23 +00:00
Yury G. Kudryashov 5020497c95 libsoup: depend on libgnome-keyring 
svn path=/nixpkgs/trunk/; revision=32899
 2012-03-08 15:37:19 +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
Yury G. Kudryashov 99337fff9d gnome-keyring-2-30.3 
svn path=/nixpkgs/trunk/; revision=32897
 2012-03-08 15:36:34 +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
Joachim Schiele 0d6be026c3 changing the name from spring-lobby to springlobby 
svn path=/nixpkgs/trunk/; revision=32895
 2012-03-08 15:30:08 +00:00
Lluís Batlle i Rossell 214c1357f9 Updating feh to 2.4 
svn path=/nixpkgs/trunk/; revision=32893
 2012-03-08 13:45:58 +00:00
Lluís Batlle i Rossell b73a6999d0 Adding a patch for go-oo, so it does not dislike gcc 4.6. 
svn path=/nixpkgs/trunk/; revision=32892
 2012-03-08 13:35:42 +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
Joachim Schiele 88b69df2dc Added two missing dependencies (to make the packages build) 
svn path=/nixpkgs/trunk/; revision=32890
 2012-03-08 13:31:16 +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 e402a4a6a6 gvfs: depend on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32888
 2012-03-08 13:06:47 +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
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
Yury G. Kudryashov 7390600a6e libsoup-2.34.3 
svn path=/nixpkgs/trunk/; revision=32883
 2012-03-08 10:14:37 +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
Lluís Batlle i Rossell bb724044b6 Updating giv. 
svn path=/nixpkgs/trunk/; revision=32881
 2012-03-08 10:08:56 +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
Ludovic Courtès 2f01e58e61 vmTools: Use stdenv's glibc in `initrd-utils'. 
svn path=/nixpkgs/trunk/; revision=32878
 2012-03-08 09:40:45 +00:00
Yury G. Kudryashov 91ef1c05ab gnome2: gvfs-1.8.2 
svn path=/nixpkgs/trunk/; revision=32877
 2012-03-08 09:27:13 +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
Yury G. Kudryashov c65ada160e KDE-4.8.1 
* Switch to .tar.xz.
* Update fixed-output derivations hashes.
* Add kde-base-artwork (ksplashx themes)

svn path=/nixpkgs/trunk/; revision=32874
 2012-03-08 06:53:44 +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 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 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 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 b2653605c4 Setting myself as maintainer of netkit tftp, to get updates if it fails to build. 
svn path=/nixpkgs/trunk/; revision=32869
 2012-03-07 22:21:24 +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
Ludovic Courtès 330a4e656a util-linux: Use Linux-specific header on Linux only. 
svn path=/nixpkgs/trunk/; revision=32867
 2012-03-07 22:15:42 +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
Yury G. Kudryashov 11f64b0449 rekonq-0.9.0-1 needs pkg-config 
svn path=/nixpkgs/trunk/; revision=32865
 2012-03-07 22:06:29 +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
Ludovic Courtès 191fbf40bd GNU Mach: Update. 
svn path=/nixpkgs/trunk/; revision=32861
 2012-03-07 21:53:37 +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
Lluís Batlle i Rossell 906f400681 I think xburst needs pkgconfig 
svn path=/nixpkgs/trunk/; revision=32858
 2012-03-07 21:38:19 +00:00
Lluís Batlle i Rossell 749df87304 Removing a patch not needed anymore, for vlc. 
svn path=/nixpkgs/trunk/; revision=32856
 2012-03-07 20:36:42 +00:00
Lluís Batlle i Rossell ce482ec155 Adding a new url for netkit tftp, as the other is down. 
svn path=/nixpkgs/trunk/; revision=32855
 2012-03-07 18:13:03 +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
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 3666a7c149 util-linux: Allow cross-compilation. 
svn path=/nixpkgs/trunk/; revision=32851
 2012-03-07 13:45:06 +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 ed325cd1ae * We accidentally lost xz support in rpm. This broke RPM builds 
(http://hydra.nixos.org/build/2230623).

svn path=/nixpkgs/trunk/; revision=32847
 2012-03-07 09:47:22 +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
Lluís Batlle i Rossell 1981a57c13 Updating inadyn. The old sourceforge place did not work anymore. 
svn path=/nixpkgs/trunk/; revision=32845
 2012-03-07 08:37:07 +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 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
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
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
Ludovic Courtès 3214f4a844 Add `stdenv.isGNU'. 
svn path=/nixpkgs/trunk/; revision=32836
 2012-03-06 21:33: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
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
Peter Simons f7896f322e libgnomeprint: fix gcc 4.6 compilation error 
svn path=/nixpkgs/trunk/; revision=32832
 2012-03-06 20:04:58 +00:00
Eelco Dolstra 38615a16e9 * Fix the checkinstall build on Glibc 2.13. 
svn path=/nixpkgs/trunk/; revision=32831
 2012-03-06 19:06:33 +00:00
Eelco Dolstra 5e4c7aa8f3 * This substitution causes bash to hang. Urgh. Bash's pattern 
substitutions aren't very reliable.

svn path=/nixpkgs/trunk/; revision=32830
 2012-03-06 18:49:44 +00:00
Peter Simons 0be4183bd5 cups: updated to version 1.5.2 
svn path=/nixpkgs/trunk/; revision=32829
 2012-03-06 16:02:04 +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
Yury G. Kudryashov ce5a0fdf68 rekonq-0.9.0-1 
svn path=/nixpkgs/trunk/; revision=32825
 2012-03-06 13:08:46 +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
Michael Raskin ef3a71007a Forgotten part of xsane: Use libpng specified, not the one propagated 
svn path=/nixpkgs/trunk/; revision=32822
 2012-03-06 12:21:09 +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 88d14c0e29 git-annex: updated to version 3.20120230 
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.

svn path=/nixpkgs/trunk/; revision=32819
 2012-03-06 11:24:20 +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 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
Michael Raskin 20c29256cf xsane needs libpng12.. 
svn path=/nixpkgs/trunk/; revision=32813
 2012-03-06 10:18:28 +00:00
Eelco Dolstra 17fe5f329a * man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads 
the first file that exists, so this is necessary to allow the
  builtin config to be overriden.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32812
 2012-03-06 10:14:00 +00:00
Eelco Dolstra b57e0d8829 * man: Work around a bug in substituteInPlace. It loses the final 
newline, and man requires every line in man.conf to be terminated by
  a newline.  We should fix the bug eventually though.
* man updated to 1.6g.  

svn path=/nixpkgs/branches/stdenv-updates/; revision=32811
 2012-03-06 10:10:56 +00:00
Michael Raskin fd9fedc32a XaoS wants libpng12 
svn path=/nixpkgs/trunk/; revision=32809
 2012-03-06 09:28:08 +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
Lluís Batlle i Rossell dbe98be6a1 Updating btar 
svn path=/nixpkgs/trunk/; revision=32807
 2012-03-05 21:23:22 +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
Yury G. Kudryashov 296eff8fbd Pass pkgconfig to kdeplasma-addons 
svn path=/nixpkgs/trunk/; revision=32805
 2012-03-05 20:59:19 +00:00
Yury G. Kudryashov 3b39886275 Oops, fix evaluation 
Forgotten to pass pkgconfig to kdeplasma-addons

svn path=/nixpkgs/trunk/; revision=32804
 2012-03-05 20:59:15 +00:00
Yury G. Kudryashov 55adb6c2f7 kdeplasma-addons depends on libdbusmenu-qt 
svn path=/nixpkgs/trunk/; revision=32803
 2012-03-05 20:51:25 +00:00
Yury G. Kudryashov 4767246246 kdeplasma-addons needs pkg-config to find some dependencies 
svn path=/nixpkgs/trunk/; revision=32802
 2012-03-05 20:51:18 +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
Ludovic Courtès e657e2c455 transfig: Keep using libpng 1.2. 
svn path=/nixpkgs/trunk/; revision=32791
 2012-03-05 09:40:36 +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 b247fa9c2c chromium: depend on libpng12 
svn path=/nixpkgs/trunk/; revision=32789
 2012-03-04 22:47:52 +00:00
Eelco Dolstra c1b59aa71d * Firefox 10.0.2. 
svn path=/nixpkgs/trunk/; revision=32776
 2012-03-04 16:34:01 +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
Mathijs Kwik 0f81c6363f gogoclient: added to release 
svn path=/nixpkgs/trunk/; revision=32761
 2012-03-04 12:28:50 +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
Yury G. Kudryashov d982e10f34 fbida-2.09 (builds with libpng-1.5) 
Cherry-pick r32756 from trunk

svn path=/nixpkgs/branches/libpng15/; revision=32757
 2012-03-04 08:56:42 +00:00
Yury G. Kudryashov b0d12859fc fbida-2.09 (builds with libpng-1.5) 
svn path=/nixpkgs/trunk/; revision=32756
 2012-03-04 08:53:46 +00:00
Shea Levy 62a2b075e4 Update rubygems 
svn path=/nixpkgs/trunk/; revision=32755
 2012-03-03 17:32:11 +00:00
Ludovic Courtès 90d1e1bb83 Add UNFS3, a user-space NFSv3 server. 
svn path=/nixpkgs/trunk/; revision=32753
 2012-03-03 16:06:27 +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
Lluís Batlle i Rossell 53e80e5316 Adding a manpage for tar, using help2man 
svn path=/nixpkgs/trunk/; revision=32749
 2012-03-03 09:52:55 +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
Eelco Dolstra 000051b196 * VirtualBox: drop the unnecessary dependency on HAL. 
svn path=/nixpkgs/trunk/; revision=32745
 2012-03-02 14:54:14 +00:00
Eelco Dolstra 15e5aead3d * Upstart 1.4. Of particular interest is the "log" stanza to redirect 
a job's stdout/stderr to a file, and "setuid" / "setgid" to execute
  a job as a different user/group.

svn path=/nixpkgs/trunk/; revision=32744
 2012-03-02 14:46:58 +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
Joachim Schiele 3fc8538884 soon to come version of spring (not live yet but at least it builds compared to the former version in nixos) 
svn path=/nixpkgs/trunk/; revision=32733
 2012-03-01 23:14:14 +00:00
Ludovic Courtès bb08271aa6 SMBFS: Disable byte-range locking in Samba's TDB. 
svn path=/nixpkgs/trunk/; revision=32732
 2012-03-01 23:07:56 +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
Lluís Batlle i Rossell f20a947a5d Updating lzop 
svn path=/nixpkgs/trunk/; revision=32730
 2012-03-01 22:03:34 +00:00
Ludovic Courtès a55fac1a87 util-linux: Use `--disable-partx' when cross-building for GNU. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32729
 2012-03-01 21:48:29 +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
Eelco Dolstra 6a5ea980ab * Bump nixUnstable. 
svn path=/nixpkgs/trunk/; revision=32724
 2012-03-01 20:18:33 +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 1ef47d19ce udisks: avoid autoreconf 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32720
 2012-03-01 15:09:53 +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
Eelco Dolstra a75ccf7dca * Don't set the nscd restart action here. 
svn path=/nixpkgs/trunk/; revision=32717
 2012-03-01 14:45: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 5a39444e76 Fix wrong merge 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32714
 2012-03-01 07:16:34 +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 57b612cb05 vpnc: added patch to fix the 'Error: either "to" is duplicate, or "ipid" is a garbage' bug 
Further details are at:

  http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22

svn path=/nixpkgs/trunk/; revision=32712
 2012-02-29 22:50:33 +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
Evgeny Egorochkin 287f1f0f65 spring-lobby: bump version to 0.139 
svn path=/nixpkgs/trunk/; revision=32697
 2012-02-29 14:29:49 +00:00
Evgeny Egorochkin 6e5a378f48 Vidalia: version bump 
svn path=/nixpkgs/trunk/; revision=32696
 2012-02-29 13:30:14 +00:00
Evgeny Egorochkin cf8d3fa4b9 Apparmor: packaged 
svn path=/nixpkgs/trunk/; revision=32695
 2012-02-29 13:30:10 +00:00
Evgeny Egorochkin bf667c9389 Vidalia: packaged 
svn path=/nixpkgs/trunk/; revision=32694
 2012-02-29 13:30:06 +00:00
Evgeny Egorochkin 0def4140f6 network-manager-applet: version bump 
svn path=/nixpkgs/trunk/; revision=32693
 2012-02-29 13:30:04 +00:00
Evgeny Egorochkin b01a720d65 TOR: version bump 
svn path=/nixpkgs/trunk/; revision=32692
 2012-02-29 13:30:01 +00:00
Evgeny Egorochkin cff68ececb network-manager: version bump 
svn path=/nixpkgs/trunk/; revision=32691
 2012-02-29 13:29:59 +00:00
Arie Middelkoop 298f4df4af Changed 'myEnvFun' to in addition put a script in 'bin' so that you can run '. load-<name>-env' to load your environment. 
svn path=/nixpkgs/trunk/; revision=32690
 2012-02-29 12:55:51 +00:00
Arie Middelkoop 45120513fb Cosmetic changes to newsreaders/kwooty and dropbox expressions. 
svn path=/nixpkgs/trunk/; revision=32689
 2012-02-29 12:54:35 +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
Arie Middelkoop d9f5e277a5 OCamlMakefile update. 
svn path=/nixpkgs/trunk/; revision=32687
 2012-02-29 12:51:06 +00:00
Arie Middelkoop d4960f72be Added an optional parameter to "make-startupitem" to provide a prefix to the ".desktop" file. 
svn path=/nixpkgs/trunk/; revision=32686
 2012-02-29 12:50:17 +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
Eelco Dolstra 6c13f317e9 * Latest PostgreSQL releases. 
svn path=/nixpkgs/trunk/; revision=32684
 2012-02-28 18:40:27 +00:00
Peter Simons 9a5c6611d0 moderncv: updated sha hash 
svn path=/nixpkgs/trunk/; revision=32681
 2012-02-28 17:34:39 +00:00
Ludovic Courtès bd68cc6f5b nix-build: Honor user-provided `failureHook'. 
svn path=/nixpkgs/trunk/; revision=32680
 2012-02-28 17:10:50 +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 207d5aae28 * Added SQL::SplitStatement. 
svn path=/nixpkgs/trunk/; revision=32678
 2012-02-28 15:53:39 +00:00
Ludovic Courtès 051129ac79 Doxygen: Add link to the bug report. 
svn path=/nixpkgs/trunk/; revision=32677
 2012-02-28 14:22:20 +00:00
Rob Vermaas 423b5b47bc add python pkgs iptools-0.4.0 
svn path=/nixpkgs/trunk/; revision=32676
 2012-02-28 11:53:34 +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 10e512f2b8 gogoclient: ipv6 tunnel 
svn path=/nixpkgs/trunk/; revision=32668
 2012-02-28 00:10:05 +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
Peter Simons 8bcba9e6d4 moderncv: upgraded to 0.19 
svn path=/nixpkgs/trunk/; revision=32664
 2012-02-28 00:09:52 +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 360ec296a6 Revert "adapted xpf to new libxml2Python" 
This reverts commit b1f634f3d384a39e015d69e348cf220855457049.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32649
 2012-02-28 00:07:08 +00:00
Florian Friesdorf 0d8bea54e0 Revert "Trying to fix the tarball, related to a problem introduced in 32596." 
This reverts commit d5172b093cb152e150620eee36141dcf7feb259d.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32648
 2012-02-28 00:07:05 +00:00
Florian Friesdorf 5f3d291001 Revert "fix python libxml2" 
This reverts commit 60a68234014b282804a1d434807d912949ea79ac.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32647
 2012-02-28 00:07:02 +00:00
Florian Friesdorf c444dd1df0 Revert "fix typos: beautifulSoup instead of beautifulSoap" 
This reverts commit 679936bfcf8519321087d1ba06bdf91444c3c55f.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32646
 2012-02-28 00:06:59 +00:00
Florian Friesdorf 457aabfad8 Revert "logilabComman and astng fixes" 
This reverts commit 7f08e8d98e43fe57b68a751d77a52574cf139e04.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32645
 2012-02-28 00:06:56 +00:00