Commit graph

6478 commits

Author SHA1 Message Date
Eelco Dolstra 3c56e571af * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
Peter Simons 10ec4c4a6a all-packages.nix: xsane doesn't depend on libpng
svn path=/nixpkgs/trunk/; revision=32818
2012-03-06 11:05:50 +00:00
Peter Simons 4adb9195bc haskell-base64-bytestring: updated to version 0.1.1.1
svn path=/nixpkgs/trunk/; revision=32815
2012-03-06 11:05:42 +00:00
Michael Raskin 20c29256cf xsane needs libpng12..
svn path=/nixpkgs/trunk/; revision=32813
2012-03-06 10:18:28 +00:00
Michael Raskin fd9fedc32a XaoS wants libpng12
svn path=/nixpkgs/trunk/; revision=32809
2012-03-06 09:28:08 +00:00
Yury G. Kudryashov b7642bfdfb svn merge ^/nixpkgs/trunk
I need the latest KDE-related changes

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

svn path=/nixpkgs/trunk/; revision=32799
2012-03-05 11:58:21 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Ludovic Courtès e657e2c455 transfig: Keep using libpng 1.2.
svn path=/nixpkgs/trunk/; revision=32791
2012-03-05 09:40:36 +00:00
Mathijs Kwik b247fa9c2c chromium: depend on libpng12
svn path=/nixpkgs/trunk/; revision=32789
2012-03-04 22:47:52 +00:00
Eelco Dolstra 962b01f686 * Remove unnecessary copy on sed.
svn path=/nixpkgs/trunk/; revision=32773
2012-03-04 15:52:41 +00:00
Eelco Dolstra 27809f0ec4 * No longer needed.
svn path=/nixpkgs/trunk/; revision=32772
2012-03-04 15:50:03 +00:00
Mathijs Kwik 0f81c6363f gogoclient: added to release
svn path=/nixpkgs/trunk/; revision=32761
2012-03-04 12:28:50 +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
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 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
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
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
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
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 81e6c12bb3 haskell-IfElse: added version 0.85
svn path=/nixpkgs/trunk/; revision=32707
2012-02-29 19:24:44 +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
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
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
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 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
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 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
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 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 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
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 762049e503 Revert "python packages cleanup"
This reverts commit 632873d81fcf9b1f85d4b2f990f92bc65dcd261a.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32641
2012-02-28 00:06:42 +00:00
Florian Friesdorf 899f37d6b2 Revert "fix python optfunc"
This reverts commit abf16535e7aa5b97bc084dd2953c3525d8f4b9aa.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32640
2012-02-28 00:06:39 +00:00
Ludovic Courtès c67edd454c QEMU-KVM 1.0 (tentative).
svn path=/nixpkgs/trunk/; revision=32637
2012-02-27 23:25:54 +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
Florian Friesdorf 998c1a3469 fix python optfunc
svn path=/nixpkgs/branches/stdenv-updates/; revision=32633
2012-02-27 21:26:59 +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 2d7b05d332 release-cross: Build gnu.smbfs.hostDrv', not gnu.smbfs'.
svn path=/nixpkgs/trunk/; revision=32628
2012-02-27 17:50:44 +00:00
Florian Friesdorf b653b3c559 python packages cleanup
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32627
2012-02-27 17:34:13 +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
Florian Friesdorf 2a6597f5cb logilabComman and astng fixes
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32623
2012-02-27 17:33:49 +00:00
Florian Friesdorf 944083026b fix typos: beautifulSoup instead of beautifulSoap
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32622
2012-02-27 17:33:44 +00:00
Ludovic Courtès 27916e6f08 GCC 4.6: Fix the Canadian cross.
svn path=/nixpkgs/trunk/; revision=32621
2012-02-27 17:22:30 +00:00
Peter Simons 47fcc7c093 pkgs/top-level/all-packages.nix: stripped extraneous whitespace
svn path=/nixpkgs/trunk/; revision=32617
2012-02-27 10:12:06 +00:00
Michael Raskin 4ff245c5de Add fresh cmake
svn path=/nixpkgs/trunk/; revision=32611
2012-02-27 06:22:47 +00:00
Florian Friesdorf ec05ab990b fix python libxml2
svn path=/nixpkgs/branches/stdenv-updates/; revision=32610
2012-02-27 00:43:07 +00:00
Lluís Batlle i Rossell dd09aa6929 I'd remain with glibc 2.13 on cross building too, as we do on native builds,
due to the lack of rpc (and therefore, lack of linux pam).


svn path=/nixpkgs/branches/stdenv-updates/; revision=32608
2012-02-26 21:53:18 +00:00
Lluís Batlle i Rossell fc9f42487e Trying to fix the tarball, related to a problem introduced in 32596.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32606
2012-02-26 21:40:37 +00:00
Lluís Batlle i Rossell f00e2914e3 Removing grub 1.98. It was useful only when we only had 1.99rc1 to boot from raid md
devices. In 1.99, all worked.


svn path=/nixpkgs/trunk/; revision=32602
2012-02-26 21:06:55 +00:00
Lluís Batlle i Rossell a9b800c8af Updating blender to 2.67. Maybe this will build in stdenv-updates too.
I remove the blender 2.49; I think I don't need it anymore.


svn path=/nixpkgs/trunk/; revision=32599
2012-02-26 20:47:12 +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 c0dcbb912c adapted xpf to new libxml2Python
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32597
2012-02-26 17:23:54 +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 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 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
Lluís Batlle i Rossell c79294e495 Updating task coach to 1.3.8.
svn path=/nixpkgs/trunk/; revision=32577
2012-02-26 16:21:12 +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
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 bfb0389d6c Disabling NLS for the zip at openoffice builders. I think it breaks the builds, based on
the nixpkgs diff for the breakage at http://hydra.nixos.org/build/1964660 .


svn path=/nixpkgs/trunk/; revision=32556
2012-02-25 15:54:57 +00:00
Yury G. Kudryashov 1cd24d18a3 Pass libpng-1.2 to pngtoico
svn path=/nixpkgs/branches/libpng15/; revision=32555
2012-02-25 03:09:36 +00:00
Lluís Batlle i Rossell 60bd341efd Trying to fix go-oo
svn path=/nixpkgs/trunk/; revision=32552
2012-02-24 22:49:41 +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
Arie Middelkoop 6b10ace1ca mcelog: a tool to access the machine check exceptions logged by the kernel.
The kernel indicated that machine check exceptions were logged, but did not tell what kind of exceptions.
In my case, this is usually the processor being throttled because it gets too hot (laptop...), but it
may also be more severe problems. Anyway, with this tool you can access these logs.

svn path=/nixpkgs/trunk/; revision=32547
2012-02-24 20:20:59 +00:00
Arie Middelkoop 72450d9b73 Added dropbox (binary).
svn path=/nixpkgs/trunk/; revision=32545
2012-02-24 17:53:19 +00:00
Peter Simons 846da9fb0a haskell-hledger-web: disable this package temporarily until it has been upgraded to support recent versions of Yesod
svn path=/nixpkgs/trunk/; revision=32539
2012-02-24 11:31:21 +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 9c06f2b68a haskell-monads-tf: added version 0.1.0.0
svn path=/nixpkgs/trunk/; revision=32533
2012-02-24 08:24:12 +00:00
Arie Middelkoop 1b2d50c14f rfkill udev package.
svn path=/nixpkgs/trunk/; revision=32532
2012-02-24 01:35:59 +00:00
Arie Middelkoop 2c7845859f Added the irc proxy "bip".
svn path=/nixpkgs/trunk/; revision=32529
2012-02-23 23:47:26 +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
Peter Simons 31e7a2ce7a gecko-mediaplayer: updated to version 1.0.5
I hoped this update would fix the build errors, but in fact it didn't. :-(

svn path=/nixpkgs/trunk/; revision=32518
2012-02-23 18:32:42 +00:00
Peter Simons 23f9485c94 haskell-mathblog: added version 0.4
svn path=/nixpkgs/trunk/; revision=32511
2012-02-23 11:33:39 +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
Ludovic Courtès e86e5db579 release-cross: Add `gnu.smbfs'.
svn path=/nixpkgs/trunk/; revision=32500
2012-02-23 00:32:09 +00:00
Ludovic Courtès c6210ec36d Samba: Fix compilation for GNU/Hurd; add to Hydra.
svn path=/nixpkgs/trunk/; revision=32498
2012-02-23 00:01:24 +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 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