Commit graph

6917 commits

Author SHA1 Message Date
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
Yury G. Kudryashov ddad8f0c02 Phonon: style, +pulseaudio
svn path=/nixpkgs/trunk/; revision=32503
2012-02-23 07:57:47 +00:00
Ludovic Courtès 79232c5f54 GCC 4.6: Enable plug-in support by default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32502
2012-02-23 00:47:31 +00:00
Ludovic Courtès 5fb4901886 GCC 4.6: Really disable stripping when `stripped' is false.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32501
2012-02-23 00:47:17 +00:00
Ludovic Courtès 98cdc2ae35 GNU libc: Update the Hurd port.
svn path=/nixpkgs/trunk/; revision=32497
2012-02-23 00:01:19 +00:00
Lluís Batlle i Rossell 371b34e49a Making octave build with qrupdate, and keep the big log of tests results of the
check phase in the out store path.


svn path=/nixpkgs/trunk/; revision=32496
2012-02-22 22:42:16 +00:00
Lluís Batlle i Rossell 61451871df Updating qrupdate and making it do the check phase
svn path=/nixpkgs/trunk/; revision=32495
2012-02-22 22:41:44 +00:00
Lluís Batlle i Rossell 4d4d324776 Making liblapack do the check phase
svn path=/nixpkgs/trunk/; revision=32494
2012-02-22 22:41:27 +00:00
Lluís Batlle i Rossell 8f7485d784 Making atlas do the check phase.
svn path=/nixpkgs/trunk/; revision=32493
2012-02-22 22:40:35 +00:00
Peter Simons 0258bf1ef1 premake: fixed meta.license field
svn path=/nixpkgs/trunk/; revision=32492
2012-02-22 21:14:53 +00:00
Peter Simons 6b0dda0771 new package: aacskeys -- grab aacs keys from bluray disks
svn path=/nixpkgs/trunk/; revision=32491
2012-02-22 20:29:46 +00:00
Peter Simons 444b195a3d new package: premake -- lua based build configuration tool
this is version 3, while 4 already exists.
But I only need this tool for 'aacskeys', which doesn't work with 4

svn path=/nixpkgs/trunk/; revision=32490
2012-02-22 20:29:42 +00:00
Peter Simons 51d9d68b51 upgraded phonon vlc backend to 0.5.0
svn path=/nixpkgs/trunk/; revision=32489
2012-02-22 20:29:39 +00:00
Peter Simons 9ac4ea27f9 upgraded phonon and its gstreamer backend to 4.6.0
svn path=/nixpkgs/trunk/; revision=32488
2012-02-22 20:29:36 +00:00
Peter Simons 383ec69fb6 new library: libbluray for playing bluray disks
optionally use libaacs to decrypt commercial disks

svn path=/nixpkgs/trunk/; revision=32486
2012-02-22 20:29:29 +00:00
Peter Simons 0efd53814f new library: libaacs for decoding bluray disks
Does not contain any drm or copyright infringements.

svn path=/nixpkgs/trunk/; revision=32485
2012-02-22 20:29:25 +00:00
Lluís Batlle i Rossell e4c4ab35e5 I think I fixed atlas for i686. It wants '-b 32'. Why, I don't know.
svn path=/nixpkgs/trunk/; revision=32471
2012-02-22 11:37:10 +00:00
Eelco Dolstra f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Lluís Batlle i Rossell bfe234644e Add make check to octave. Some tests fail, but the build works. We'll have the report this way.
svn path=/nixpkgs/trunk/; revision=32467
2012-02-21 23:02:36 +00:00
Lluís Batlle i Rossell fb12a6838f I remove clapack, and an unused reference I found.
Now liblapack provides a c interface too.


svn path=/nixpkgs/trunk/; revision=32466
2012-02-21 22:16:33 +00:00
Lluís Batlle i Rossell b5a904153b Building octave with mesa and fltk to have the new fltk graphics toolkit available.
I also add more libs octave appreciates for some functions.

I've not tested the graphics toolkit, but it builds.


svn path=/nixpkgs/trunk/; revision=32465
2012-02-21 22:09:48 +00:00
Lluís Batlle i Rossell 5e2de19cc1 Fixing octave, so plot(1) works.
Linking octave with clapack did not work.

I updated lapack, and additionally I build it with atlas, instead of blas. That should give
better performance. I don't know if atlas builds everywhere though.

On the other hand, maybe some programs linking with liblapack will fail. We'll have to check
the hydra reports.

I plan to remove clapack; liblapack provides a C interface too.


svn path=/nixpkgs/trunk/; revision=32464
2012-02-21 21:43:44 +00:00
Peter Simons bbc7b11572 haskell-dimensional: updated to version 0.10.2
svn path=/nixpkgs/trunk/; revision=32461
2012-02-21 16:41:30 +00:00
Lluís Batlle i Rossell 47e9932cd2 I attempted to get octave 3.4.3 working with atlas, but it also builds and crashes at
plot(1), as 3.6.0 also did. I don't know what's wrong there.

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff694e3ad in dtrtri_

Exact as 3.6.0. I'll revert to the old octave version that worked without any
blas or lapack implementation.

--This line, and those below, will be ignored-e-

M    pkgs/development/interpreters/octave/default.nix

svn path=/nixpkgs/trunk/; revision=32460
2012-02-21 15:45:22 +00:00
Lluís Batlle i Rossell 2847a37fa9 Updating atlas to 3.9.67, the latest development version
svn path=/nixpkgs/trunk/; revision=32458
2012-02-21 14:49:36 +00:00
Yury G. Kudryashov 8229dc4357 Trying to fix soqt for qt-4.8
svn path=/nixpkgs/trunk/; revision=32454
2012-02-21 13:52:32 +00:00
Peter Simons 6c796fa539 haskell-yesod-core: updated to version 0.10.2.1
svn path=/nixpkgs/trunk/; revision=32453
2012-02-21 13:39:29 +00:00
Lluís Batlle i Rossell a81366984e Updating octave to 3.6.0
svn path=/nixpkgs/trunk/; revision=32451
2012-02-21 11:34:57 +00:00
Peter Simons eac4153574 haskell-yesod-form: updated to version 0.4.2
svn path=/nixpkgs/trunk/; revision=32448
2012-02-21 10:07:12 +00:00
Peter Simons 8011875681 haskell-conduit: updated to version 0.2.2
svn path=/nixpkgs/trunk/; revision=32447
2012-02-21 10:07:10 +00:00
Peter Simons 9843a6f100 yesod-core: disable haddock phase in this version of the package to avoid build failures because of syntax errors in the documentation
The bug has been reported upstream.

svn path=/nixpkgs/trunk/; revision=32446
2012-02-21 10:07:08 +00:00
Peter Simons 19b43c8f42 haskell-yesod-core: updated to version 0.10.2
svn path=/nixpkgs/trunk/; revision=32438
2012-02-20 19:03:15 +00:00
Peter Simons 1dd8249087 haskell-hxt: updated to version 9.2.1
svn path=/nixpkgs/trunk/; revision=32437
2012-02-20 19:03:12 +00:00
Eelco Dolstra 45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Peter Simons 95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Peter Simons 9cc0657c86 haskell-hlint: updated to version 1.8.24
svn path=/nixpkgs/trunk/; revision=32422
2012-02-20 10:45:02 +00:00
Peter Simons d2ef3f937c haskell-happstack-server: updated to version 6.6.3
svn path=/nixpkgs/trunk/; revision=32421
2012-02-20 10:45:00 +00:00
Peter Simons 2fc61e1010 haskell-smallcheck: updated to version 0.6.1
svn path=/nixpkgs/trunk/; revision=32420
2012-02-20 10:44:57 +00:00
Peter Simons 037eafa2cf haskell-fclabels: updated to version 1.1.1.0
svn path=/nixpkgs/trunk/; revision=32419
2012-02-20 10:44:53 +00:00
Peter Simons 6e9ecace50 haskell-SDL: updated to version 0.6.3
svn path=/nixpkgs/trunk/; revision=32418
2012-02-20 10:44:49 +00:00
Yury G. Kudryashov d8454e538c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Yury G. Kudryashov 4c5aaf3736 qtscriptgenerator: qt-4.8 patch
svn path=/nixpkgs/trunk/; revision=32414
2012-02-20 05:27:57 +00:00
Eelco Dolstra 1133387eb1 * Fix rubberband.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32404
2012-02-19 17:20:20 +00:00
Eelco Dolstra 0922e0fb71 * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32403
2012-02-19 17:12:37 +00:00
Eelco Dolstra a50d32e4db * Fix oprofile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
2012-02-19 17:03:38 +00:00
Peter Simons cecff49b34 Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal.
This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems
that don't distinguish case.

svn path=/nixpkgs/trunk/; revision=32401
2012-02-19 17:03:35 +00:00
Lluís Batlle i Rossell 3b02e6f70d Updating super tux kart to 0.7.3. I also add the library irrlicht, the specific
version needed for super tux kart.


svn path=/nixpkgs/trunk/; revision=32399
2012-02-19 13:15:50 +00:00
Yury G. Kudryashov 61e7d39e05 libpng-1.5.9 (see CVE 2011-3026)
svn path=/nixpkgs/branches/libpng15/; revision=32398
2012-02-19 11:23:05 +00:00
Yury G. Kudryashov 313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov 5c6a3faf4e Merge ^/nixpkgs/trunk
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +00:00
Yury G. Kudryashov 668a505214 libpng-1.2.47 (see CVE 2011-3026)
svn path=/nixpkgs/trunk/; revision=32394
2012-02-19 10:59:31 +00:00
Lluís Batlle i Rossell d77cfce6d3 Adding bullet. Patch by Alexander Foremny.
svn path=/nixpkgs/trunk/; revision=32393
2012-02-19 10:51:04 +00:00
Yury G. Kudryashov 024c247807 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32382
2012-02-18 16:26:34 +00:00
Shea Levy e45be4fcaf Remove coffee-script rubygem
A seeming bug the "nix" rubygem causes activesupport's dependencies to be set
incorrectly when execjs is one of the relevant gems. I'll try to fix it, but
until then IMO a working activesupport is more important than coffee-script

svn path=/nixpkgs/trunk/; revision=32377
2012-02-17 22:34:46 +00:00
Ludovic Courtès 5481e67e23 GNU libc: Backport Hurd-related changes from glibc 2.12 in trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32374
2012-02-17 22:12:40 +00:00
Eelco Dolstra 0811db080e * Move all glibc versions to development/libraries/glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32373
2012-02-17 22:02:37 +00:00
Eelco Dolstra 6c2de318ad * Move all gcc versions to development/compilers/gcc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32371
2012-02-17 21:47:08 +00:00
Shea Levy 86710c1fe6 Ruby gems: Install all dependent gems in the user environment
svn path=/nixpkgs/trunk/; revision=32370
2012-02-17 21:40:14 +00:00
Shea Levy 2fb0d1c6c7 Update ruby/rubygems
svn path=/nixpkgs/trunk/; revision=32366
2012-02-17 20:33:15 +00:00
Eelco Dolstra da3ecd1256 * gcc-apple: produce a libstdc++.dylib that doesn't depend on
/usr/lib/libstdc++.dylib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32365
2012-02-17 19:33:12 +00:00
Eelco Dolstra 0e6c77befa * On Darwin, don't link Perl against /usr/lib/libutil.dylib. Libutil
uses /usr/lib/libstdc++.dylib, and so we get segfaults when using
  Perl modules that depend on another libstdc++.dylib (like Nix's Perl
  bindings).  It doesn't appear that libutil provides useful
  functionality for Perl on Darwin.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32364
2012-02-17 19:32:15 +00:00
Yury G. Kudryashov c1c3317f65 vigra: fix install
svn path=/nixpkgs/trunk/; revision=32362
2012-02-17 18:50:29 +00:00
Yury G. Kudryashov 14a5b4991c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32360
2012-02-17 17:44:20 +00:00
Yury G. Kudryashov e446dee4c3 Backport r32353 from stdenv-udpates
* Get rid of Qt 4.6.  It doesn't compile with GCC 4.6.  There was only
  one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

Eelco, could you please fix the date in caneda version?

svn path=/nixpkgs/trunk/; revision=32359
2012-02-17 17:40:58 +00:00
Eelco Dolstra d575666a12 * Fix building zlib on Cygwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32358
2012-02-17 17:02:18 +00:00
Eelco Dolstra 31ebc5d950 * Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only
one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32353
2012-02-17 14:34:42 +00:00
Eelco Dolstra b23126fcc3 * Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
2012-02-17 14:32:28 +00:00
Peter Simons d27f8787f7 haskell-http-date: updated to version 0.0.2
svn path=/nixpkgs/trunk/; revision=32351
2012-02-17 14:02:01 +00:00
Yury G. Kudryashov 79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Yury G. Kudryashov ed8caa2c7f svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32347
2012-02-17 13:10:05 +00:00
Yury G. Kudryashov afb26b6aed vigra-1.8.0
svn path=/nixpkgs/trunk/; revision=32346
2012-02-17 13:03:41 +00:00
Yury G. Kudryashov 572a26b27e mediastreamer-2.8.0
svn path=/nixpkgs/trunk/; revision=32343
2012-02-17 13:03:27 +00:00
Arie Middelkoop f8b1a1db26 Coccinelle: wrapper for 'spatch.opt'.
There was already a wrapper for spatch, but not for the optimized version 'spatch.opt'.
Actually, for coccinelle in nixpkgs, I'd propose to only provide the optimized version of
spatch, as it makes no difference for the end user.

svn path=/nixpkgs/trunk/; revision=32341
2012-02-16 23:55:46 +00:00
Yury G. Kudryashov f8926aa0d7 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32335
2012-02-16 18:18:34 +00:00
Peter Simons 255dc2478d haskell-cabal2nix: updated to version 1.27
svn path=/nixpkgs/trunk/; revision=32332
2012-02-16 17:48:28 +00:00
Peter Simons e76f971db6 haskell-happstack-hamlet: updated to version 6.2.4
svn path=/nixpkgs/trunk/; revision=32331
2012-02-16 17:47:59 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32327
2012-02-16 14:05:41 +00:00
Peter Simons b7e432214b haskell-packages.nix: improved handling of 'Cabal'
Most packages use the Cabal library only as a build tool, and as such it is a
dependency of the cabal.nix builder -- not of the package that's being built
with that builder.

svn path=/nixpkgs/trunk/; revision=32326
2012-02-16 14:05:01 +00:00
Yury G. Kudryashov 070874c5f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32321
2012-02-16 11:23:36 +00:00
Peter Simons 0fea240440 haskell-alternative-io: added meta.maintainers section
svn path=/nixpkgs/trunk/; revision=32318
2012-02-16 09:05:47 +00:00
Peter Simons 3b0b922884 haskell-uniplate: updated to version 1.6.6
svn path=/nixpkgs/trunk/; revision=32317
2012-02-16 09:05:45 +00:00
Peter Simons 62757d7b36 haskell-simple-sendfile: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=32316
2012-02-16 09:05:43 +00:00
Peter Simons 40919ea624 haskell-pandoc: updated to version 1.9.1.1
svn path=/nixpkgs/trunk/; revision=32315
2012-02-16 09:05:40 +00:00
Peter Simons f0584f1367 haskell-language-javascript: updated to version 0.4.9
svn path=/nixpkgs/trunk/; revision=32314
2012-02-16 09:05:38 +00:00
Peter Simons f76039e1e0 haskell-hmatrix: updated to version 0.13.1.0
svn path=/nixpkgs/trunk/; revision=32313
2012-02-16 09:05:35 +00:00
Peter Simons 61175b2026 haskell-haskell-src-meta: updated to version 0.5.1
svn path=/nixpkgs/trunk/; revision=32312
2012-02-16 09:05:33 +00:00
Peter Simons 3d85ce1843 haskell-crypto-pubkey-types: updated to version 0.1.1
svn path=/nixpkgs/trunk/; revision=32311
2012-02-16 09:05:27 +00:00
Shea Levy 75d4746680 Update rubygems
svn path=/nixpkgs/trunk/; revision=32309
2012-02-16 02:07:23 +00:00
Eelco Dolstra b9309ffdaf * Typo (spotted by Danny Groenewegen).
svn path=/nixpkgs/trunk/; revision=32307
2012-02-15 16:30:46 +00:00
Eelco Dolstra 0b0f44b117 * Updated apr to 1.4.6 and apr-util to 1.4.1.
svn path=/nixpkgs/trunk/; revision=32303
2012-02-15 16:21:33 +00:00
Peter Simons ca1912036b cppcheck: added version 1.53
svn path=/nixpkgs/trunk/; revision=32302
2012-02-15 16:07:45 +00:00
Peter Simons c5d870f1d8 sparse: updated to version 0.4.4
svn path=/nixpkgs/trunk/; revision=32301
2012-02-15 16:07:38 +00:00
Peter Simons 26d8fc0ca1 haskell-language-javascript: updated to version 0.4.8
svn path=/nixpkgs/trunk/; revision=32297
2012-02-15 10:39:20 +00:00
Peter Simons 2df2202804 haskell-highlighting-kate: updated to version 0.5.0.5
svn path=/nixpkgs/trunk/; revision=32296
2012-02-15 10:39:18 +00:00
Peter Simons c37d8c5f90 haskell-hashable: updated to version 1.1.2.3
svn path=/nixpkgs/trunk/; revision=32295
2012-02-15 10:39:15 +00:00
Peter Simons 9882d962d1 haskell-alternative-io: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=32294
2012-02-15 10:39:09 +00:00
Peter Simons ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Peter Simons 844d950d13 haskell-cabal2nix: updated to version 1.26
svn path=/nixpkgs/trunk/; revision=32291
2012-02-14 16:59:04 +00:00
Peter Simons 3256e7f5c2 haskell-nixos-types: removed obsolete package
svn path=/nixpkgs/trunk/; revision=32290
2012-02-14 16:59:01 +00:00
Peter Simons adc9bf0510 haskell-packages.nix: removed obsolete 'aeson-native' and 'blaze-textual-native'
svn path=/nixpkgs/trunk/; revision=32289
2012-02-14 16:58:58 +00:00
Peter Simons 89a958e4d0 haskell-packages.nix: allow packages to be built with a version of 'Cabal' other than the one shipped with the compiler
svn path=/nixpkgs/trunk/; revision=32288
2012-02-14 16:58:56 +00:00
Peter Simons 5cbc5242a8 haskell-wai-logger: updated to version 0.1.4
svn path=/nixpkgs/trunk/; revision=32286
2012-02-14 16:58:51 +00:00
Peter Simons f2ee9177d0 haskell-stb-image: updated to version 0.2.1
svn path=/nixpkgs/trunk/; revision=32285
2012-02-14 16:58:48 +00:00
Peter Simons e6f6c4b42e haskell-shakespeare-i18n: updated to version 0.0.2
svn path=/nixpkgs/trunk/; revision=32284
2012-02-14 16:58:46 +00:00
Peter Simons 75da6dea33 haskell-libmpd: updated to version 0.7.2
svn path=/nixpkgs/trunk/; revision=32283
2012-02-14 16:58:43 +00:00
Peter Simons 19be3645ad haskell-http-types: updated to version 0.6.9
svn path=/nixpkgs/trunk/; revision=32282
2012-02-14 16:58:41 +00:00
Peter Simons 385e002338 haskell-hakyll: updated to version 3.2.6.1
svn path=/nixpkgs/trunk/; revision=32281
2012-02-14 16:58:38 +00:00
Peter Simons 1bc51d7448 haskell-hackage-db: updated to version 1.3
svn path=/nixpkgs/trunk/; revision=32280
2012-02-14 16:58:35 +00:00
Peter Simons 9c1bdb6d90 haskell-ghc-mod: updated to version 1.10.5
svn path=/nixpkgs/trunk/; revision=32279
2012-02-14 16:58:33 +00:00
Peter Simons 70d973551a haskell-bitmap: updated to version 0.0.2
svn path=/nixpkgs/trunk/; revision=32278
2012-02-14 16:58:30 +00:00
Peter Simons 3c63b41aa4 haskell-tar: added version 0.4.0.0
svn path=/nixpkgs/trunk/; revision=32277
2012-02-14 16:58:27 +00:00
Peter Simons f1abe7d195 haskell-network: updated 2.3.x version to 2.3.0.11
svn path=/nixpkgs/trunk/; revision=32276
2012-02-14 16:58:24 +00:00
Peter Simons ebdb515865 pkgs/development/compilers/gcc-4.6: added 'enablePlugin' attribute (defaults to false) to add support for GCC plugins (such as melt)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32275
2012-02-14 14:42:59 +00:00
Peter Simons 35a4593277 pkgs/development/compilers/gcc-4.6: strip trailing whitespace
svn path=/nixpkgs/branches/stdenv-updates/; revision=32274
2012-02-14 14:42:56 +00:00