Commit graph

7342 commits

Author SHA1 Message Date
Peter Simons da350b93a2 Updated Haskell packages.
- bson: updated to version 0.2.0
 - cpu: updated to version 0.1.1
 - defaults.nix: cosmetic
 - iteratee: updated to version 0.8.9.1
 - ListLike: updated to version 3.1.5
 - mongoDB: updated to version 1.3.0
 - packages.nix: cosmetic
 - stringsearch: added version 0.3.6.3
 - system-fileio: updated to version 0.3.8
 - wai-extra: updated to version 1.2.0.5

svn path=/nixpkgs/trunk/; revision=34517
2012-06-15 08:06:11 +00:00
Lluís Batlle i Rossell 24ed82236a Changing an 'if' to cleaner optionalAttrs.
svn path=/nixpkgs/trunk/; revision=34513
2012-06-14 21:28:41 +00:00
Lluís Batlle i Rossell 0f795aea78 Making libtheora build on mips64el-linux
svn path=/nixpkgs/trunk/; revision=34511
2012-06-14 19:54:19 +00:00
Eelco Dolstra 3c948a1a03 * libiodbc: fix the iodbctest program, which had a broken RPATH.
svn path=/nixpkgs/trunk/; revision=34506
2012-06-13 15:26:50 +00:00
Eelco Dolstra 4f19239875 * Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
2012-06-13 14:11:52 +00:00
Peter Simons abdd4f3498 haskell-ghc-mod: updated to version 1.10.18
svn path=/nixpkgs/trunk/; revision=34498
2012-06-13 12:57:33 +00:00
Peter Simons 1de91e33f3 haskell-async: updated to version 2.0.0.0
svn path=/nixpkgs/trunk/; revision=34497
2012-06-13 12:57:29 +00:00
Lluís Batlle i Rossell c5e03fecce Updating doxygen to 1.8.1. It fixes some parsing issues in 1.8.0.
svn path=/nixpkgs/trunk/; revision=34496
2012-06-13 12:44:52 +00:00
Yury G. Kudryashov 5487fbe94a telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
2012-06-13 07:09:23 +00:00
Yury G. Kudryashov c6d9ead047 Add vanilla pkg-config
Some packages (e.g., telepathy) rely on the upstream way to handle
Requires.private in pkg-config.

svn path=/nixpkgs/trunk/; revision=34492
2012-06-13 07:09:10 +00:00
Peter Simons ff2b57f957 Updated Haskell packages.
- BNFC-meta: updated to version 0.3.0.3
 - HUnit: added version 1.2.4.3
 - multirec: updated to version 0.7.2
 - resourcet: updated to version 0.3.2.2

svn path=/nixpkgs/trunk/; revision=34489
2012-06-13 07:08:57 +00:00
Eelco Dolstra 4c868ec330 * PHP updated to 5.3.13.
svn path=/nixpkgs/trunk/; revision=34480
2012-06-12 17:39:59 +00:00
Peter Simons d2d77e702e haskell-cabal2nix: updated to version 1.34
svn path=/nixpkgs/trunk/; revision=34476
2012-06-12 08:42:55 +00:00
Peter Simons 7a626565df Updated Haskell packages.
- parsec: added version 3.1.3
 - xmonad-extras: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=34475
2012-06-12 08:39:32 +00:00
Mathijs Kwik c0efa356fc uhc: fixed building on ghc 7.2.1+
by removing the check for the 'binary' package, which is built-in from
that version onward. This is a workaround for the problem where ghc's
built-in libraries (like containers, array, binary) don't show up in
"ghc-pkg list" output.

svn path=/nixpkgs/trunk/; revision=34471
2012-06-11 18:58:28 +00:00
Peter Simons ac3df043d6 haskell-happstack-data: obsolete package removed
svn path=/nixpkgs/trunk/; revision=34463
2012-06-11 17:15:52 +00:00
Peter Simons 09321105f1 ghc: added version 7.4.2
svn path=/nixpkgs/trunk/; revision=34460
2012-06-11 16:25:45 +00:00
Peter Simons 6054beaee7 haskell-Agda: patched to support modern versions of mtl
Committed on behalf of Karn Kallio.

svn path=/nixpkgs/trunk/; revision=34454
2012-06-11 10:40:10 +00:00
Florian Friesdorf 3133b57940 leptonica-1.68 needs older libpng12
no newer leptonica release available

svn path=/nixpkgs/trunk/; revision=34452
2012-06-11 10:28:25 +00:00
Ludovic Courtès 22da1866a7 Qt 4.8: Disable dependency on MESA when the platform doesn't support it.
svn path=/nixpkgs/trunk/; revision=34450
2012-06-11 09:31:43 +00:00
Peter Simons a7949741f6 gimp 2.8
- rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1]
- remove babl_0_1_10 and gegl_0_2_0 and use them as default versions

[1] http://article.gmane.org/gmane.linux.distributions.nixos/8708

svn path=/nixpkgs/trunk/; revision=34444
2012-06-11 07:17:39 +00:00
Peter Simons 58f3a6e25e Updated Haskell packages.
- accelerate-cuda: updated to version 0.12.1.0
 - accelerate-examples: updated to version 0.12.1.0
 - accelerate-io: updated to version 0.12.1.0
 - accelerate: updated to version 0.12.1.0
 - hakyll: updated to version 3.3.0.1
 - pandoc: updated to version 1.9.4.1
 - Vec: updated to version 0.9.9

svn path=/nixpkgs/trunk/; revision=34431
2012-06-11 07:04:40 +00:00
Karn Kallio ea102b34f6 Patch PAKCS to build with GHC 7.4.1 .
Also fix symbolic links to emacs lisp files.

svn path=/nixpkgs/trunk/; revision=34430
2012-06-11 06:05:18 +00:00
Joachim Schiele 249badd76f a minor update as the package seems to be incomplete
svn path=/nixpkgs/trunk/; revision=34428
2012-06-10 22:35:35 +00:00
Joachim Schiele 9629d66928 qt_mobility is a requirement for monav i'm going to package soon
svn path=/nixpkgs/trunk/; revision=34427
2012-06-10 21:31:06 +00:00
Karn Kallio b81add3520 Change download location for qt everywhere 4.8.2; was not found.
svn path=/nixpkgs/trunk/; revision=34414
2012-06-10 00:51:46 +00:00
Yury G. Kudryashov 1629524bb2 qt-gstreamer-0.10.2
svn path=/nixpkgs/trunk/; revision=34401
2012-06-09 13:09:33 +00:00
Yury G. Kudryashov ecc8549965 soprano-2.7.6, update patch
svn path=/nixpkgs/trunk/; revision=34399
2012-06-09 13:09:24 +00:00
Yury G. Kudryashov 70316d4e42 attica-0.4.0
svn path=/nixpkgs/trunk/; revision=34398
2012-06-09 13:09:20 +00:00
Yury G. Kudryashov 0d83120fd8 qt-4.8.2
svn path=/nixpkgs/trunk/; revision=34397
2012-06-09 13:09:16 +00:00
Yury G. Kudryashov eef17e625f pyqt-4.9.1
svn path=/nixpkgs/trunk/; revision=34396
2012-06-09 13:09:13 +00:00
Yury G. Kudryashov 888a6507e6 sip-4.13.2
svn path=/nixpkgs/trunk/; revision=34395
2012-06-09 13:09:07 +00:00
Eelco Dolstra b36fce8040 * NSPR updated to 4.9.1.
svn path=/nixpkgs/trunk/; revision=34390
2012-06-08 17:41:59 +00:00
Joachim Schiele 1181658cb8 this won't compile yet as there is a python problem, probably related to what marc weber already fixed. will fix that later
svn path=/nixpkgs/trunk/; revision=34388
2012-06-08 15:57:53 +00:00
Peter Simons e55ca0628f Updated Haskell packages.
- generic-deriving: updated to version 1.2.1
 - ghc-mod: updated to version 1.10.17
 - gitit: updated to version 0.10.0.1
 - graphviz: updated to version 2999.13.0.3
 - hsemail: updated to version 1.7.2
 - split: updated to version 0.1.4.3

svn path=/nixpkgs/trunk/; revision=34384
2012-06-08 13:38:20 +00:00
Andres Löh 789df7619e Updated GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=34379
2012-06-08 08:25:30 +00:00
Andres Löh 4d7e4334d9 Patching ghc-events to work with latest mtl.
svn path=/nixpkgs/trunk/; revision=34377
2012-06-07 10:58:24 +00:00
Marco Maggesi 4a5f21239f Fix build of neon on darwin
svn path=/nixpkgs/trunk/; revision=34375
2012-06-06 21:47:26 +00:00
Marco Maggesi 93f41f5ad3 Fix build of apr on darwin
svn path=/nixpkgs/trunk/; revision=34374
2012-06-06 21:44:20 +00:00
Marco Maggesi cadc02cb2b Fix build of ocaml 3.12.1 on darwin
svn path=/nixpkgs/trunk/; revision=34373
2012-06-06 20:44:11 +00:00
Cillian de Roiste 4b2c3d52de Adding optional wx (GUI) support for Erlang, which enables the graphical debugger although pman (the process manager) fails to start.
svn path=/nixpkgs/trunk/; revision=34372
2012-06-06 19:05:06 +00:00
Peter Simons 36d30b8279 Updated Haskell packages.
- cereal: updated to version 0.3.5.2
 - leksah-server: updated to version 0.12.1.1
 - repa-algorithms: updated to version 3.2.1.1
 - repa-examples: updated to version 3.2.1.1
 - repa-io: updated to version 3.2.1.1
 - repa: updated to version 3.2.1.1
 - RepLib: updated to version 0.5.3
 - unbound: updated to version 0.4.1

svn path=/nixpkgs/trunk/; revision=34366
2012-06-06 08:08:25 +00:00
Lluís Batlle i Rossell 430b055516 Adding crossAttrs to cross-build qt with mingw32 and mingw64
svn path=/nixpkgs/trunk/; revision=34364
2012-06-05 21:21:21 +00:00
Cillian de Roiste 1067f51f92 Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency
svn path=/nixpkgs/trunk/; revision=34362
2012-06-05 16:52:11 +00:00
Ludovic Courtès 797fafd808 hwloc: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34359
2012-06-05 12:29:03 +00:00
Peter Simons 7d15ad90b9 Updated Haskell packages.
- http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
2012-06-05 08:31:42 +00:00
aszlig d0d4123962 Compile glibc without -fstack-protector.
At least until NixOS full supports -fstack-protector it's better to turn it off
at the moment, as previous successful builds didn't include it either.
2012-06-04 19:54:32 +02:00
Cillian de Roiste 27bef25b17 Applying the patch from Rok Garbas to add GIMP 2.8.0
svn path=/nixpkgs/trunk/; revision=34352
2012-06-04 17:38:47 +00:00
Peter Simons c63096c9a9 haskell-filestore: disable Haddock phase to fix build with GHC 7.0.4
svn path=/nixpkgs/trunk/; revision=34340
2012-06-04 09:46:16 +00:00
Peter Simons 4fdbd75e4f Updated Haskell packages.
- ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
2012-06-04 09:24:14 +00:00
Peter Simons f3649161ec haskell-cabal2nix: updated to version 1.33
svn path=/nixpkgs/trunk/; revision=34329
2012-06-03 18:57:30 +00:00
Peter Simons b89f433951 haskell-reactive-banana-wx: re-generated expression with the latest version of Cabal2Nix
The package won't compile when 'buildExamples' is enabled. First of all,
it depends on an ancient version of the 'executable-path' library. That
problem can be remedied by adding

  patchPhase = ''
    sed -i -e 's|executable-path == 0.0.\*|executable-path|' reactive-banana-wx.cabal
  '';

..., but even then it won't build because the Cabal file doesn't declare
all dependencies properly. Both GHC 7.0.4 and 7.4.1 fail complaining
about the absence of Prelude.

svn path=/nixpkgs/trunk/; revision=34328
2012-06-03 18:52:43 +00:00
Peter Simons 7ea86fc8a2 Updated Haskell packages.
- hlint: updated to version 1.8.29
 - hscolour: updated to version 1.20.2
 - random-fu: updated to version 0.2.3.0

svn path=/nixpkgs/trunk/; revision=34324
2012-06-03 18:26:09 +00:00
Ludovic Courtès ad17bee255 hwloc: Fix typo.
svn path=/nixpkgs/trunk/; revision=34315
2012-06-01 13:06:35 +00:00
Marco Maggesi 6cf6d40534 Update OCaml sqlite3
svn path=/nixpkgs/trunk/; revision=34312
2012-06-01 09:42:29 +00:00
Marco Maggesi de6b7ac64e Update download link for pcre-ocaml
svn path=/nixpkgs/trunk/; revision=34311
2012-06-01 06:08:29 +00:00
Marco Maggesi 7fda94a082 Upstream hash change
svn path=/nixpkgs/trunk/; revision=34310
2012-05-31 21:26:12 +00:00
Ludovic Courtès 6bba2234c4 hwloc: Add -L' for numactl in libhwloc.la'.
svn path=/nixpkgs/trunk/; revision=34306
2012-05-31 16:45:37 +00:00
Ludovic Courtès 99e9ea69b5 hwloc: Add dependency on pciutils and numactl on Linux.
svn path=/nixpkgs/trunk/; revision=34304
2012-05-31 15:47:38 +00:00
Michael Raskin f6b2f17bc3 Given that I have a vested interest in working LLVM now - add myself as maintainer
svn path=/nixpkgs/trunk/; revision=34302
2012-05-31 11:26:16 +00:00
Michael Raskin 2de23edd59 Adding LLVM 3.1. (as a separate attribute, because it seems to be API-incompatible)
svn path=/nixpkgs/trunk/; revision=34300
2012-05-31 11:04:28 +00:00
Peter Simons 83d7540add haskell-regex-pcre: updated to version 0.94.4
svn path=/nixpkgs/trunk/; revision=34299
2012-05-31 07:24:54 +00:00
Peter Simons bd1c986e5b haskell-monad-loops: updated to version 0.3.3.0
svn path=/nixpkgs/trunk/; revision=34298
2012-05-31 07:24:50 +00:00
Peter Simons 0781e6718c haskell-highlighting-kate: updated to version 0.5.1
svn path=/nixpkgs/trunk/; revision=34297
2012-05-31 07:24:47 +00:00
Peter Simons 1dcdab8988 haskell-gitit: updated to version 0.10
svn path=/nixpkgs/trunk/; revision=34296
2012-05-31 07:24:44 +00:00
Peter Simons 0deabf5eaa haskell-filestore: updated to version 0.5
svn path=/nixpkgs/trunk/; revision=34295
2012-05-31 07:24:40 +00:00
Eelco Dolstra eed22970cd * Updated to pycrypto to 2.6.
svn path=/nixpkgs/trunk/; revision=34291
2012-05-30 21:12:04 +00:00
Peter Simons 0b56a39d46 haskell-multiplate: patched to support current mtl and transformers
svn path=/nixpkgs/trunk/; revision=34289
2012-05-29 21:26:15 +00:00
Peter Simons 8fad2b0a98 haskell-happstack-util: patched to support current mtl and transformers
svn path=/nixpkgs/trunk/; revision=34288
2012-05-29 21:26:09 +00:00
Peter Simons 5fb3ac1d5b haskell-happstack-data: patched to support current mtl and transformers
svn path=/nixpkgs/trunk/; revision=34287
2012-05-29 21:25:52 +00:00
Peter Simons 72a4c7aa88 haskell-Shellac-haskeline: patched to support current mtl and transformers
svn path=/nixpkgs/trunk/; revision=34286
2012-05-29 21:25:45 +00:00
Peter Simons e70b655b3c haskell-hledger: updated to version 0.18
svn path=/nixpkgs/trunk/; revision=34283
2012-05-29 20:16:08 +00:00
Peter Simons bb2d3311a2 haskell-hledger-web: updated to version 0.18
svn path=/nixpkgs/trunk/; revision=34282
2012-05-29 20:16:06 +00:00
Peter Simons 011cd1baa6 haskell-hledger-lib: updated to version 0.18
svn path=/nixpkgs/trunk/; revision=34281
2012-05-29 20:16:01 +00:00
Ludovic Courtès 7e9eb60cfe hwloc 1.4.2.
svn path=/nixpkgs/trunk/; revision=34279
2012-05-29 16:37:34 +00:00
Ludovic Courtès 606913fc8f hwloc: Disable dependency on Cairo and X11 on Cygwin.
svn path=/nixpkgs/trunk/; revision=34278
2012-05-29 16:37:31 +00:00
Ludovic Courtès 472a9d6e3d GNU M4: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34277
2012-05-29 16:37:28 +00:00
Andres Löh 4e10015cab Added gnumeric.
svn path=/nixpkgs/trunk/; revision=34272
2012-05-29 12:21:33 +00:00
Ludovic Courtès ae23a33b9a GNU Gettext: Fix Cygwin build.
svn path=/nixpkgs/trunk/; revision=34270
2012-05-29 10:13:23 +00:00
Ludovic Courtès 8c810af59b GNU libiconv: Build the static library on Cygwin.
svn path=/nixpkgs/trunk/; revision=34269
2012-05-29 09:08:55 +00:00
Mathijs Kwik 459de475ee node.js : upgraded to 0.6.18
svn path=/nixpkgs/trunk/; revision=34266
2012-05-29 07:43:56 +00:00
Mathijs Kwik 4129e8e78c v8: upgraded to latest stable (3.6.6.25)
svn path=/nixpkgs/trunk/; revision=34265
2012-05-29 07:43:50 +00:00
Marco Maggesi 0ff3dd24ad Fix hash change of ocaml-pcre sources
svn path=/nixpkgs/trunk/; revision=34260
2012-05-28 14:14:35 +00:00
Peter Simons 952fabe3ce haskell-cabal2nix: updated to version 1.32
svn path=/nixpkgs/trunk/; revision=34258
2012-05-28 11:14:19 +00:00
Peter Simons e6f2845b30 haskell-defaults.nix: switch ghc 7.4.1 to latest versions of 'mtl' and 'transformers'
svn path=/nixpkgs/trunk/; revision=34256
2012-05-28 10:53:46 +00:00
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