Commit Graph

12454 Commits

Author SHA1 Message Date
Peter Simons
f92a5cbfc6 pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:

  (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };

See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
2013-11-07 12:14:19 +01:00
Peter Simons
89c566fcfd pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages
Haskell packages -- i.e. packages built by our Cabal builder -- invariably have
the attributes 'pname' and 'version'. We use the absence of these attributes to
recognize non-Haskell packages and filter them from the closed package set
generated by closePropagation. We do this so that the generated Haskell
environment won't contain paths like "/lib/libz.a", which are part of the
closure but have nothing to do with Haskell.

The previous scheme used the attribute 'ghc' to accomplish the same thing, but
unfortunately other packages to contain a 'ghc' attribute, too, like the
old-style ghc-wrapper. Including the ghc-wrapper in this environment is
pointless, obviously. The new approach filters the ghc-wrapper successfully.
2013-11-07 12:14:19 +01:00
Peter Simons
9c1982cd68 Merge pull request #1179 from cpages/sdl2
SDL2: some improvements to the expression.
2013-11-07 02:16:00 -08:00
Vladimír Čunát
0eeee298ef perl: avoid --no-cpp-precomp on darwin, (close #1160)
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch

Conflicts (trivial):
	pkgs/development/interpreters/perl/5.16/default.nix
2013-11-07 10:39:28 +01:00
Carles Pagès
b81caba5fb SDL2: some improvements to the expression.
Based on comments in the pull request from @edolstra and @peti. I also added
missing metadata, setting myself as maintainer.
2013-11-06 23:17:46 +01:00
Eelco Dolstra
58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Eelco Dolstra
77dc219127 gcc: Support FreeBSD 2013-11-06 10:41:02 +01:00
Lluís Batlle i Rossell
cfe5f74e88 Updating poppler to 0.24.3. 2013-11-06 10:09:08 +01:00
Michael Raskin
66c034d03e Merge pull request #1171 from cpages/sdl2
Update SDL2 to v2.0.1
2013-11-05 20:32:07 -08:00
Shea Levy
9817bada91 Update nodePackages to npm2nix-5.2.0
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-05 18:02:21 -05:00
Lluís Batlle i Rossell
1045df3197 Updating mkvtoolnix, libebml, libmatroska to latest versions. 2013-11-05 23:20:27 +01:00
Rickard Nilsson
2d44f3e8af sbt: Update to 0.13.0
Also remove all old sbt versions, and rename package to
sbt instead of simple-build-tool. sbt seems to be
the correct name for this package.
2013-11-05 14:51:14 +01:00
Rickard Nilsson
b5554b3f5c libvirt: Update to 1.1.4
Remove the patch that has been added upstream.
2013-11-05 14:15:42 +01:00
Eelco Dolstra
da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Eelco Dolstra
d9c13a73c2 gurobi: Remove
It's proprietary, non-redistributable software.
2013-11-05 00:07:24 +01:00
Eelco Dolstra
c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra
01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Carles Pagès
b551f8bced SDL2: clean configure flags.
I removed some flags that are no longer present, one that was redundant
(default value) and added a comment regarding why enable-static is there.
2013-11-04 19:49:57 +01:00
Peter Simons
0e831bd525 Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'. 2013-11-04 19:42:49 +01:00
Carles Pagès
1138f0a96b SDL2: update to v2.0.1 2013-11-04 19:37:53 +01:00
Eric Kow
d1e8f9c047 haskell-wxc: noHaddock 2013-11-02 18:09:08 +00:00
Peter Simons
8352df8d66 haskell-yesod-platform: update to version 1.2.4.4 2013-11-01 14:20:11 +01:00
Peter Simons
5fd1c46beb haskell-trifecta: update to version 1.2.1.1 2013-11-01 14:20:11 +01:00
Peter Simons
2de6d71694 haskell-trifecta: update to version 1.1 2013-11-01 14:20:11 +01:00
Peter Simons
dda0d13d22 haskell-text-icu: update to version 0.6.3.7 2013-11-01 14:20:11 +01:00
Peter Simons
a4cfdfad5d haskell-terminfo: update to version 0.3.2.6 2013-11-01 14:20:11 +01:00
Peter Simons
6e180df18c haskell-intervals: update to version 0.4 2013-11-01 14:20:11 +01:00
Peter Simons
15851f0661 haskell-free: update to version 4.2 2013-11-01 14:20:11 +01:00
Peter Simons
03e7ab54a0 haskell-fclabels: update to version 2.0.0.5 2013-11-01 14:20:11 +01:00
Peter Simons
40a31df497 haskell-Elm: update to version 0.10.0.2 2013-11-01 14:20:11 +01:00
Mathijs Kwik
b6519f08da haskell-parsers: bring back 0.9 for idris 2013-11-01 08:02:19 +01:00
Mathijs Kwik
3c2b7f5e33 haskell-trifecta: bring back 1.1 for idris 2013-11-01 08:02:19 +01:00
Mathijs Kwik
07d68731ff haskell-trifecta: jailbreak on comonad 2013-11-01 08:02:13 +01:00
Domen Kožar
ebcdbbbdd2 Merge pull request #1132 from lovek323/php54-pcntl
php54: add pcntl option
2013-10-31 07:29:38 -07:00
Peter Simons
86443f4efd haskell-cabal2nix: update to version 1.55 2013-10-31 09:02:25 +01:00
Peter Simons
7337c675df haskell-uuid: update to version 1.3.3 2013-10-31 09:02:25 +01:00
Peter Simons
7deb37d1f9 haskell-symbol: update to version 0.2.0 2013-10-31 09:02:25 +01:00
Peter Simons
4bf277e39b haskell-postgresql-simple: update to version 0.3.9.1 2013-10-31 09:02:25 +01:00
Peter Simons
7399dba217 haskell-pipes-parse: update to version 2.0.1 2013-10-31 09:02:24 +01:00
Peter Simons
df12cd8a7b haskell-intervals: update to version 0.3 2013-10-31 09:02:24 +01:00
Peter Simons
e0c633a402 haskell-hslua: update to version 0.3.8 2013-10-31 09:02:24 +01:00
Peter Simons
f7ea8a57df haskell-hexpat: update to version 0.20.4 2013-10-31 09:02:24 +01:00
Peter Simons
ece9b21522 haskell-feed: update to version 0.3.9.2 2013-10-31 09:02:24 +01:00
Peter Simons
436885b067 haskell-fclabels: update to version 2.0.0.2 2013-10-31 09:02:24 +01:00
Peter Simons
56dfdba91b haskell-constraints: update to version 0.3.4.2 2013-10-31 09:02:24 +01:00
Peter Simons
29054f9a87 haskell-blaze-builder: update to version 0.3.2.0 2013-10-31 09:02:24 +01:00
Peter Simons
aa3fad72ad haskell-HDBC-postgresql: update to version 2.3.2.2 2013-10-31 09:02:24 +01:00
Peter Simons
793be25a9a haskell-gloss: update to version 1.8.1.1 2013-10-31 09:02:24 +01:00
Peter Simons
90d80c3d35 haskell-OpenGL: update 2.9.x branch to version 2.9.1.0 2013-10-31 09:02:24 +01:00
Domen Kozar
d9ba437875 libedit: add FreeBSD support 2013-10-31 00:47:33 +01:00
Michael Raskin
92e3206c2a Updating SlimerJS to Git version for compatibility with fresh xulrunner 2013-10-31 02:59:45 +04:00
Pascal Wittmann
6e062f1434 Agda: update to 2.3.2.2.
This update also fixes the build errors on hydra that were caused by
an incompatible version of haskell-src-ext.

Close #1153.
2013-10-30 23:30:39 +02:00
Eric Kow
0f8b1b1a5c libusb1: avoid -lgcc_s on darwin
close #1151
2013-10-30 19:19:54 +02:00
Vladimir Still
d7d3c8fd82 sqliteodbc: update to 0.995, add more metadata
close #1122
2013-10-30 19:00:09 +02:00
Domen Kožar
09fa7304ae ninka: update to 1.1 and refactor 2013-10-30 11:47:12 +01:00
Michael Raskin
52d5290118 Update SlimerJS 2013-10-30 13:03:47 +04:00
Rok Garbas
b040814679 changes in: redshift, geoclue, libsoup
- added support for geoclue for redshift
 - package geoclue 2.0.0 (as geoclue2)
 - package libsoup 2.44.1 (as libsoup_2_40)
2013-10-29 16:25:31 +01:00
Domen Kožar
789af5fb08 libedit: 20100424-3.0 -> 20130712-3.1 2013-10-29 09:35:25 +01:00
Michael Raskin
3bda40c150 A few hooks for easier library handling when CFFI is used 2013-10-29 11:29:46 +04:00
Michael Raskin
22ddf66b54 Adding a facility to generate Lisp module definitions from QuickLisp; no sane update facility yet; adding Esrap-PEG as a test 2013-10-29 10:56:33 +04:00
aszlig
46b2bd427c
portmidi: New package in version 217.
This uses a patch from Gentoo to disable Java support for now, as it is
not needed for supporting Mixxx (which is the package I'm preparing).
Hopefully, the patch will be applied upstream so we can safely drop it
here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:48 +01:00
Peter Simons
094edba311 ghc-with-packages.nix: make sure that GHC itself is included in the environment 2013-10-28 17:54:28 +01:00
Baptist BENOIST
736b295bc5 vtk: Use the Qt libraries as an argument instead of a boolean
To prevent multiple Qt libraries when developing with a custom one, the Qt
support can now be activated by directly supplying the Qt libraries as an
argument (qtLib).

qtSDK and qtFull users/developers now just have to define an override such
as the following one in order to use it inside their development
environment:

vtk.override { qtLib = qt4SDK; };

The previous behavior is still the same for vtk and vtkWithQt4 end-users.

Change-Id: I517762d4ff7de46d32cc46e6e725fd62737caa52
2013-10-28 10:00:32 +01:00
Jason "Don" O'Conal
f79ae71748 php54: add pcntl option 2013-10-27 23:57:44 +00:00
Jason "Don" O'Conal
ab18b33f3e sup: update to latest version 2013-10-27 21:57:09 +01:00
Peter Simons
216e9976fe haskell-uniplate: update to version 1.6.12 2013-10-27 19:07:15 +01:00
Peter Simons
aab65b9f2b haskell-socks: update to version 0.5.4 2013-10-27 19:07:15 +01:00
Peter Simons
fbe6b6cbff haskell-modular-arithmetic: update to version 1.1.0.0 2013-10-27 19:07:15 +01:00
Peter Simons
089506aac6 haskell-diagrams-svg: update to version 0.8.0.2 2013-10-27 19:07:15 +01:00
Peter Simons
06c22ac95d haskell-data-lens: update to version 2.10.4 2013-10-27 19:07:15 +01:00
Peter Simons
4aabba9dab haskell-cryptocipher: update to version 0.6.2 2013-10-27 19:07:14 +01:00
Peter Simons
3807c0ffc3 haskell-crypto-cipher-types: update to version 0.0.9 2013-10-27 19:07:14 +01:00
Peter Simons
ef29da6cc5 haskell-crypto-cipher-tests: update to version 0.0.11 2013-10-27 19:07:14 +01:00
Peter Simons
e93599cb23 haskell-cipher-des: update to version 0.0.6 2013-10-27 19:07:14 +01:00
Peter Simons
19cfd3da63 haskell-Elm: update to version 0.10.0.1 2013-10-27 19:07:14 +01:00
Peter Simons
7daab74440 haskell-Cabal: update to version 1.18.1.2 2013-10-27 19:07:14 +01:00
Peter Simons
5ff31ef887 haskell-accelerate-fft: disable Hydra builds because of unfree dependency on CUDA 2013-10-27 12:33:48 +01:00
Peter Simons
41fe95f770 haskell-cufft: disable Hydra builds because of unfree dependency on CUDA 2013-10-27 12:33:39 +01:00
Peter Simons
f5e8f1ccc1 ghc: update HEAD version to 7.7.20130828 2013-10-27 10:22:21 +01:00
Peter Simons
d64917ad17 Back-port Haskell-related improvements from stdenv-updates.
* There now is full support for building Haskell packages as shared libraries
   for GHC versions 7.4.2 or later. The Cabal builder recognizes the following
   attributes:

    - enableSharedLibraries configures Cabal to build of shared libraries in
      addition to static ones. This option requires that all dependencies of
      the package have been compiled for use in shared libraries, too.

    - enableSharedExecutables configures Cabal to prefer shared libraries when
      linking executables.

   The default values for these attributes are arguments to the haskellPackages
   expression.

 * Haskell builds now run in a LANG="en_US.UTF-8" environment to avoid plenty
   of build and test suite errors. Without this setting, GHC seems unable to
   deal with the UTF-8 character encoding that's generally considered standard
   in the Haskell world.

 * The Cabal builder supports a new attribute 'testTarget' to specify the exact
   set of tests to be run during the check phase.

 * The ghc-wrapper attribute ghcVersion has been removed. Instead, we use the
   ghc.version attribute, which exists in unwrapped GHC derivations, too.
2013-10-27 10:09:36 +01:00
Peter Simons
e1c9c133b0 Merge pull request #1110 from errge/master
Add text-format haskell library
2013-10-26 09:20:05 -07:00
Peter Simons
3ef25bbfe0 Merge pull request #1114 from ocharles/linear
haskellPackages.linear: Update to 1.3.1
2013-10-26 09:19:24 -07:00
Peter Simons
cbacc46e45 haskell-hslua: remove support for linking the system's lua library
This feature is broken: <https://github.com/osa1/hslua/issues/8>.
2013-10-26 18:17:04 +02:00
Marc Weber
78f7baf3b7 Fix .deepOverride on poppler, glib
By moving the default derivation into callPackage call, close #1115.
2013-10-26 13:54:24 +02:00
Bjørn Forsman
a13ed71b43 xc3sprog: new package
xc3sprog is command-line tools for programming FPGAs, microcontrollers
and PROMs via JTAG.

Homepage: http://xc3sprog.sourceforge.net/

I'm using the latest from subversion as xc3sprog doesn't seem to make
proper releases. There are only a few seemingly random snapshots at
sourceforge. And these snapshots are built binary packages, not source
archives.

NOTE: I haven't tested this on any hardware yet.
2013-10-26 12:43:12 +02:00
Bjørn Forsman
200d629733 Fix evaluation error caused by the "ats" expression 2013-10-26 12:43:12 +02:00
Shea Levy
665c4882e8 Add ats
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-25 13:33:32 -04:00
Peter Simons
1b86a6d399 haskell-HaRe: update to version 0.7.0.7 2013-10-24 23:29:55 +02:00
Peter Simons
76e95492c8 haskell-xdot: update to version 0.2.4 2013-10-24 23:29:55 +02:00
Peter Simons
f2811c4882 haskell-uuid: update to version 1.3.2 2013-10-24 23:29:54 +02:00
Peter Simons
da503a5f3c haskell-tagstream-conduit: update to version 0.5.4.1 2013-10-24 23:29:54 +02:00
Peter Simons
fe953f6d20 haskell-pandoc: update to version 1.12.1 2013-10-24 23:29:54 +02:00
Peter Simons
a6c77b1885 haskell-monad-control: update to version 0.3.2.2 2013-10-24 23:29:54 +02:00
Peter Simons
851155e198 haskell-Hipmunk: update to version 5.2.0.12 2013-10-24 23:29:54 +02:00
Peter Simons
cf08417baa haskell-Elm: update to version 0.10 2013-10-24 23:29:54 +02:00
Peter Simons
a773bf4398 haskell-HTF: add version 0.11.0.1 2013-10-24 23:29:54 +02:00
Peter Simons
fadca15b2e haskell-language-ecmascript: add version 0.15.2 2013-10-24 23:29:54 +02:00
Peter Simons
5efa7019c7 haskell-xmlgen: add version 0.6.2.0 2013-10-24 23:29:54 +02:00
Peter Simons
be4d957a9c haskell-case-insensitive: update to version 1.1.0.1 2013-10-24 23:29:54 +02:00