Commit graph

7207 commits

Author SHA1 Message Date
Peter Simons c664157e7d Updated Haskell packages.
- attoparsec: updated to version 0.10.2.0
 - blaze-html: dropped obsolete version 0.4.3.4
 - cairo: updated to version 0.12.3.1
 - cryptocipher: updated to version 0.3.4
 - file-embed: updated to version 0.0.4.4
 - glib: updated to version 0.12.3.1
 - gtk2hs-buildtools: updated to version 0.12.3.1
 - gtksourceview2: updated to version 0.12.3.1
 - hakyll: updated to version 3.3.0.0
 - happstack-server: updated to version 7.0.2
 - hjsmin: updated to version 0.1.2
 - http-conduit: updated to version 1.4.1.7
 - http-types: updated to version 0.6.11
 - language-c-quote: updated to version 0.3.1.2
 - parallel: added version 3.2.0.3
 - regex-pcre: updated to version 0.94.3
 - regex-posix: added version 0.95.2
 - shakespeare-js: updated to version 1.0.0.3
 - svgcairo: updated to version 0.12.1.1
 - text: added version 0.11.2.1
 - vty: updated to version 4.7.0.14
 - warp: updated to version 1.2.1.1
 - yaml: updated to version 0.7.0.2
 - yesod-static: updated to version 1.0.0.3

svn path=/nixpkgs/trunk/; revision=34255
2012-05-28 10:23:20 +00:00
Lluís Batlle i Rossell d40123a247 Making librsync not stripped by native strip; it breaks the static lib.
It's the case of mingw64 by default, it seems.


svn path=/nixpkgs/trunk/; revision=34248
2012-05-25 17:52:45 +00:00
Andres Löh 3ff236c739 Latest change (or reverse change) for the upcoming Haskell Platform.
svn path=/nixpkgs/trunk/; revision=34245
2012-05-25 16:19:52 +00:00
Lluís Batlle i Rossell 44b2d21212 Mingw changes to gcc.
Removing a gcc flag, --enable-version-specific-runtime-libs, that put gcc libs
in a speparate directory instead of /lib; this broke the installation of
libgcc_s.a for the case of "--enable-shared" in mingw-w64. And we already have all gccs in directories apart.

I also add the option --enable-fully-dynamic-string, which is used in the
prebuilt mingw64 toolchain; this way nixpkgs creates ABI-compatible binaries
with mingw64 upstream. (told by jon_y on irc ##mingw)


svn path=/nixpkgs/trunk/; revision=34242
2012-05-25 13:49:01 +00:00
Lluís Batlle i Rossell c0be42fd68 Trying to fix crossGNU builds (attribute `platform.kernelMajor' missing)
svn path=/nixpkgs/trunk/; revision=34239
2012-05-25 08:15:41 +00:00
Lluís Batlle i Rossell e9186a03b9 Making gcc not build libgomp with uclibc, as it lacks '-ldl' in its checks and
I don't know how to add it.
This makes gcc build with uclibc.


svn path=/nixpkgs/trunk/; revision=34231
2012-05-24 21:45:49 +00:00
Lluís Batlle i Rossell 5aa41fb2ef Adding a check for linux 2.6 related cross build parameters in glibc.
svn path=/nixpkgs/trunk/; revision=34230
2012-05-24 21:45:18 +00:00
Lluís Batlle i Rossell d9fdfffef9 Fixing the mingw cross gcc. I set it not to build shared libraries, because its specs for
shared libraries are wrong.
It should run "-lstdc++ -lsupc++" if libstdc++-6.dll is available, and instead it runs
"-lstdc++" and therefore lack symbols.

I think simply few people use shared gcc libs on mingw.


svn path=/nixpkgs/trunk/; revision=34225
2012-05-24 19:02:27 +00:00
Ludovic Courtès 0524b60614 PCRE: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34219
2012-05-24 15:03:54 +00:00
Ludovic Courtès 801c82da55 GNU Guile 2.0: Provide a 2.0ish setup hook.
svn path=/nixpkgs/trunk/; revision=34215
2012-05-22 21:18:20 +00:00
Lluís Batlle i Rossell 7962af0fe5 Updating libv4l (part of v4l-utils). I moved v4l-utils to stdenv.mkDerivation style,
and it's used to build either libv4l or the utils (with qt4).


svn path=/nixpkgs/trunk/; revision=34208
2012-05-22 14:30:12 +00:00
Andres Löh f0e99eca2a Updated the Haskell Platform prerelease.
svn path=/nixpkgs/trunk/; revision=34206
2012-05-22 06:14:35 +00:00
Andres Löh 6706ef1e99 Fixed incorrect version number of Haskell Platform.
svn path=/nixpkgs/trunk/; revision=34192
2012-05-21 06:17:27 +00:00
Andres Löh 0542d35900 Added prerelease version of haskell-platform-2012.2.0.0
svn path=/nixpkgs/trunk/; revision=34191
2012-05-20 21:04:52 +00:00
Andres Löh 513b42ef2b Regenerated accelerate-examples expression with cabal2nix.
svn path=/nixpkgs/trunk/; revision=34190
2012-05-20 20:31:15 +00:00
Andres Löh 5144845d71 Platform refinement.
This should be stable under regeneration with hackage4nix.

svn path=/nixpkgs/trunk/; revision=34189
2012-05-20 20:21:55 +00:00
Andres Löh 56a2503c80 Remove platforms from accelerate-cuda.
svn path=/nixpkgs/trunk/; revision=34188
2012-05-20 19:56:35 +00:00
Andres Löh 7aa85ac536 Adding NVIDIA CUDA toolkit and haskell-accelerate-cuda plus deps.
svn path=/nixpkgs/trunk/; revision=34186
2012-05-20 17:38:03 +00:00
Cillian de Roiste 531b63a389 Patching python-virtualenv so that it doesn't fail if the python version is specified, e.g. --python=python2.7, and now iff the python version is specified it successfully also installs additional libs such as readline into the virtualenv
svn path=/nixpkgs/trunk/; revision=34184
2012-05-19 23:15:50 +00:00
Mathijs Kwik c84bc77774 reactive-banana-wx haskell package
svn path=/nixpkgs/trunk/; revision=34152
2012-05-17 10:16:14 +00:00
Mathijs Kwik 14968a4923 cabal-macosx haskell package
svn path=/nixpkgs/trunk/; revision=34151
2012-05-17 10:16:10 +00:00
Mathijs Kwik 660341c395 executable-path haskell package
svn path=/nixpkgs/trunk/; revision=34150
2012-05-17 10:16:05 +00:00
Andres Löh e5e2432277 Upgrade ghc stable snapshot to 7.4.2rc1.
svn path=/nixpkgs/trunk/; revision=34137
2012-05-16 12:00:05 +00:00
Peter Simons 9be7b3b4be haskell-reactive-banana: updated to version 0.6.0.0
svn path=/nixpkgs/trunk/; revision=34136
2012-05-16 08:58:34 +00:00
Peter Simons e2df1da1e0 haskell-certificate: updated to version 1.2.3
svn path=/nixpkgs/trunk/; revision=34135
2012-05-16 08:58:30 +00:00
Cillian de Roiste e9548cc845 Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest.
svn path=/nixpkgs/trunk/; revision=34117
2012-05-15 17:57:50 +00:00
Cillian de Roiste a5d77fcf2b Updating erlange to R14B04
svn path=/nixpkgs/trunk/; revision=34116
2012-05-15 17:54:05 +00:00
Rickard Nilsson c7ab74bacc lsof 4.86.
svn path=/nixpkgs/trunk/; revision=34106
2012-05-15 14:09:15 +00:00
Peter Simons 201bdca962 Updated Haskell packages.
- cryptocipher: updated to version 0.3.2
 - Crypto: updated to version 4.2.5
 - darcs: updated to version 2.8.1
 - hamlet: updated to version 1.0.1.3
 - monad-par-extras: updated to version 0.3.2
 - persistent-template: updated to version 0.9.0.2
 - pool-conduit: updated to version 0.1.0.2
 - shakespeare-css: updated to version 1.0.1.2
 - shakespeare-i18n: updated to version 1.0.0.2
 - shakespeare-js: updated to version 1.0.0.2
 - shakespeare-text: updated to version 1.0.0.2
 - shakespeare: updated to version 1.0.0.2
 - warp: updated to version 1.2.1
 - wxcore: updated to version 0.90.0.1
 - wxc: updated to version 0.90.0.3
 - wx: updated to version 0.90.0.1
 - xml-conduit: updated to version 0.7.0.3
 - xss-sanitize: updated to version 0.3.2
 - yesod-auth: updated to version 1.0.2.1
 - yesod-core: updated to version 1.0.1.2
 - yesod-default: updated to version 1.0.1.1
 - yesod-form: updated to version 1.0.0.4
 - yesod-json: updated to version 1.0.0.1
 - yesod-persistent: updated to version 1.0.0.1
 - yesod-routes: updated to version 1.0.1.2
 - yesod-static: updated to version 1.0.0.2
 - yesod: updated to version 1.0.1.6

svn path=/nixpkgs/trunk/; revision=34102
2012-05-15 11:50:48 +00:00
Peter Simons 13a10c3e54 Updated Haskell packages.
- authenticate: updated to version 1.2.1.1
 - blaze-html: added version 0.5.0.0 (unused right now because happstack can't deal with it)
 - BNFC-meta: updated to version 0.3.0.2
 - graphviz: patched build to succeed with transformers 0.3.x
 - haskeline: updated to version 0.6.4.7
 - http-conduit: updated to version 1.4.1.3
 - numeric-prelude: updated to version 0.3.0.2
 - pandoc: updated to version 1.9.3

svn path=/nixpkgs/trunk/; revision=34087
2012-05-14 09:56:52 +00:00
Eelco Dolstra a78d2f55fb * Perl: set passthru.libPrefix to communicate the relative location of
Perl packages for $PERL5LIB.

svn path=/nixpkgs/trunk/; revision=34061
2012-05-11 13:41:24 +00:00
Peter Simons 5dd0d85528 Updated Haskell packages.
- haskell-src-exts: updated to version 1.13.3
 - MemoTrie: updated to version 0.5
 - semigroups: updated to version 0.8.3.2
 - tagged: updated to version 0.4.2.1
 - vector-space: updated to version 0.8.1
 - WebBits: updated to version 2.2

svn path=/nixpkgs/trunk/; revision=34060
2012-05-11 13:04:35 +00:00
Ludovic Courtès 63a9c0e5a1 LCOV: Fix FreeBSD patch.
svn path=/nixpkgs/trunk/; revision=34057
2012-05-11 09:31:37 +00:00
Michel Alexandre Salim 2c64c7fe9d - update leiningen to 1.7.1
- apply patch (applied upstream) to assume rlwrap is present
- update expression to depend on rlwrap
- rebase the nix-specific patch to apply cleanly

svn path=/nixpkgs/trunk/; revision=34056
2012-05-11 03:36:13 +00:00
Ludovic Courtès e3ccebccec GNU libc 2.13: Skip `dont_use_system_ld_so_cache.patch' on GNU.
svn path=/nixpkgs/trunk/; revision=34053
2012-05-10 20:23:45 +00:00
Eelco Dolstra 3bb2f92106 * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
2012-05-10 14:41:16 +00:00
Andres Löh 50a51c7654 Reverting some more Haskell changes, to make things complete again.
svn path=/nixpkgs/trunk/; revision=34044
2012-05-10 14:23:48 +00:00
Peter Simons c07854ace4 Updated Haskell packages.
- DSH: updated to version 0.7.8.1
 - alex: updated to versino 3.0.2
 - certificate: updated to version 1.2.2
 - language-c: updated to version 0.4.2
 - xhtml: updated to version 3000.2.1

Also, downgraded GHC 7.4.1 environment to use mtl 2.0 and transformers 2.0 to
avoid lots of build errors, i.e. with monad-par.

svn path=/nixpkgs/trunk/; revision=34042
2012-05-10 10:28:49 +00:00
Eelco Dolstra bf2d945a02 * Disable some failing builds on specific platforms.
svn path=/nixpkgs/trunk/; revision=34033
2012-05-09 21:10:12 +00:00
Andres Löh 40274ca75c Adapted the ghc-7.4.1 package version defaults to upcoming Platform release.
svn path=/nixpkgs/trunk/; revision=34032
2012-05-09 17:21:37 +00:00
Andres Löh aa6e1f4586 Added haskell-mpi and dependencies.
svn path=/nixpkgs/trunk/; revision=34030
2012-05-09 16:19:52 +00:00
Ludovic Courtès c1dd4327dc GNU Guile 2.0: Fix cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=34029
2012-05-09 13:42:46 +00:00
Eelco Dolstra 24594b0fb3 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
2012-05-09 11:49:52 +00:00
Peter Simons 5930e47068 Updated Haskell packages.
- attoparsec-conduit: updated to version 0.4.0.1
 - conduit: updated to version 0.4.2
 - network-conduit: updated to version 0.4.0.1
 - persistent-sqlite: updated to version 0.9.0.2
 - persistent: updated to version 0.9.0.4
 - semigroups: updated to version 0.8.3.1
 - wai-app-static: updated to version 1.2.0.3
 - wai-extra: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.2
 - warp: updated to version 1.2.0.2
 - xml-conduit: updated to version 0.7.0.2

svn path=/nixpkgs/trunk/; revision=34027
2012-05-09 11:25:59 +00:00
Mathijs Kwik 206c6b1bbb upgraded uhc
svn path=/nixpkgs/trunk/; revision=34026
2012-05-09 10:01:41 +00:00
Peter Simons 1cdbd5add0 numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen
The patch broke the build of matplotlib.

svn path=/nixpkgs/trunk/; revision=34023
2012-05-09 07:22:18 +00:00
Peter Simons 58c83ceae2 haskell-file-embed: updated to version 0.0.4.3
svn path=/nixpkgs/trunk/; revision=34016
2012-05-08 10:08:16 +00:00
Peter Simons 10e9b46ffb haskell-abstract-par: updated to version 0.3.1
svn path=/nixpkgs/trunk/; revision=34015
2012-05-08 10:08:13 +00:00
Lluís Batlle i Rossell 57397d3331 Updating libraw1394 to 2.0.8.
svn path=/nixpkgs/trunk/; revision=34014
2012-05-08 09:52:16 +00:00
Lluís Batlle i Rossell 97abdd38a5 Adding the Allied Technologies libdc1394 variant and the cc1394 viewer.
svn path=/nixpkgs/trunk/; revision=34013
2012-05-08 09:50:58 +00:00