Commit graph

10114 commits

Author SHA1 Message Date
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
2013-03-25 13:43:45 +01:00
Peter Simons 1764ea2b0a libxslt: fix impurity on 'native-stdenv' platforms
libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
2013-03-25 13:16:28 +01:00
Peter Simons e655c6afd7 libxslt: revert impurity fix on 'native-stdenv' platforms
Commit 16863d8ffe caused massive re-builds.
This change needs to be made differently.
2013-03-25 13:02:03 +01:00
Peter Simons 16863d8ffe libxslt: fix impurity on 'native-stdenv' platforms
libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
2013-03-25 12:44:23 +01:00
Peter Simons ac86eed59c gnumake: disable test suite on FreeBSD
One test fails, unfortunately, but I'm not sure what to do about it.
2013-03-25 12:44:23 +01:00
Peter Simons 67c9b39b60 haskell-hakyll: update to version 4.2.2.0 2013-03-25 11:47:58 +01:00
Peter Simons 7943ac41cd haskell-circle-packing: add myself as maintainer 2013-03-25 11:47:58 +01:00
Peter Simons aff27c669e haskell-cuda: add version 0.5.0.1 2013-03-25 11:47:58 +01:00
Peter Simons d2fff5ed22 gnulib: add version 0.0-7898-gdb9cad7 2013-03-24 23:32:14 +01:00
Peter Simons 6f85323164 haskell-circle-packing: add version 0.1.0.2 2013-03-24 18:08:35 +01:00
Peter Simons 8de45f4da4 haskell-arithmoi: add version 0.4.0.3 2013-03-24 17:44:05 +01:00
Peter Simons 194673f1f5 haskell-wai-extra: update to version 1.3.3.2 2013-03-24 17:33:53 +01:00
Peter Simons 62480ce404 haskell-hamlet: update to version 1.1.7 2013-03-24 17:33:53 +01:00
Peter Simons 40b194caf9 haskell-diagrams-contrib: update to version 0.6.1 2013-03-24 17:33:53 +01:00
Peter Simons 9497164f61 haskell-conduit: update to version 1.0.4.1 2013-03-24 17:33:53 +01:00
Peter Simons 17a4e0f13c haskell-blaze-builder: update to version 0.3.1.1 2013-03-24 17:33:53 +01:00
Peter Simons b6aaccc816 haskell-attoparsec-conduit: update to version 1.0.1 2013-03-24 17:33:52 +01:00
Peter Simons 1670613203 haskell-editline: add myself as maintainer 2013-03-24 17:33:26 +01:00
Peter Simons f684ed19ba haskell-editline: add old version 0.2.1.0 2013-03-23 18:44:44 +01:00
Peter Simons 83d0a3a37c ghc: add meta.license attribute to all compiler versions 2013-03-23 15:58:14 +01:00
Peter Simons 6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Peter Simons ac8b39f66a haskell-wai-extra: jailbreak to fix build with latest version of 'void' 2013-03-23 15:58:14 +01:00
Peter Simons 81970ff445 haskell-conduit: jailbreak to fix build with latest version of 'void' 2013-03-23 15:58:14 +01:00
Peter Simons 9e5910620f haskell-void: update to version 0.6 2013-03-23 15:58:14 +01:00
Peter Simons 3aab8525ed haskell-bytestring-lexing: update to version 0.4.3 2013-03-23 15:58:14 +01:00
Rok Garbas 54d81f1b6b opencv: python bindings 2013-03-23 00:44:19 +01:00
Carles Pagès 381660cf31 doxygen: update to 1.8.3.1
There are many bugfixes and some new features over 1.8.1.
2013-03-22 15:44:27 +01:00
Mathijs Kwik 69237ccb12 haskell-bson: disable tests
they need an older version of test-framework
using jailbreak didn't work in this case so for now, disabling tests
is the easiest solution until upstream upgrades its test-framework
2013-03-22 00:00:06 +01:00
Peter Simons efd18b91fd haskell-HSH: fix build with ghc 7.4.x 2013-03-21 22:43:34 +01:00
Peter Simons a28ff44c76 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 16:26:34 +01:00
Peter Simons 264ac17a0f ghc-with-packages: set NIX_GHC_XXX variables for runhaskell and runghc, too 2013-03-21 16:26:18 +01:00
Peter Simons 459234db20 ghc-with-packages: include only derivations in the generated environment that have a ghc attribute
This predicate filters out packages that weren't created by the Cabal builder.
Doing that greatly reduces the likelihood of file collisions in the generated
environment, because Haskell packages tend to have a lot of propagated build
inputs.

For example, both zeromq 2.x and 3.x use the same names for their header files.
Users of haskell-zeromq don't need those headers, so we just don't include them
in the generated environment to avoid the collision that would otherwise occur
when haskell-zeromq 2.x and 3.x are installed into the same environment.
2013-03-21 16:25:50 +01:00
Sander van der Burg 770741b5b4 androidenv: fix error with obsolete quotation 2013-03-21 14:21:20 +01:00
Sander van der Burg 647bca444c Allow appnames with spaces everywhere 2013-03-21 14:11:58 +01:00
Sander van der Burg 1dbd3a55c4 libv8-rubygem: Implemented a very depressing workaround that allows scons to build libv8.a, it's ugly but it works 2013-03-21 13:56:33 +01:00
Ludovic Courtès c8ff101724 glibc 2.17: Make the `fetchgit' argument optional. 2013-03-21 13:25:51 +01:00
Ludovic Courtès d69e680035 glibc 2.17: Reinstate support for cross-GNU builds. 2013-03-21 13:08:38 +01:00
Peter Simons 8993677607 haskell-transformers-compat: update to version 0.1.1.1 2013-03-21 11:15:43 +01:00
Peter Simons e4fd98a2ef haskell-persistent-template: update to version 1.1.3.1 2013-03-21 11:15:42 +01:00
Peter Simons 95961786c7 haskell-libxml-sax: update to version 0.7.4 2013-03-21 11:15:42 +01:00
Peter Simons bbc516c59e haskell-gitit: update to version 0.10.3.1 2013-03-21 11:15:42 +01:00
Peter Simons fda16ef232 haskell-filestore: update to version 0.6.0.1 2013-03-21 11:15:42 +01:00
Peter Simons c06acb1bfb haskell-diagrams-contrib: update to version 0.6.0.4 2013-03-21 11:15:42 +01:00
Peter Simons 53b329cd9d haskell-bytestring-lexing: update to version 0.4.2 2013-03-21 11:15:42 +01:00
Peter Simons 75551477ce haskell-active: update to version 0.1.0.4 2013-03-21 11:15:42 +01:00
Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Vladimír Čunát d91df9a4bd krb5: fix build via update 2013-03-20 23:36:17 +01:00
Vladimír Čunát 365dc52872 protobuf: fix via update 2013-03-20 23:25:43 +01:00
Lluís Batlle i Rossell 39be94cb68 ffmpeg: enabling ffplay
Playing sound, it displays great ffts.
2013-03-20 22:20:51 +01:00
Lluís Batlle i Rossell a799b8ef5d ffmpeg: add opus support, enabled by default 2013-03-20 22:20:51 +01:00