Commit graph

1552 commits

Author SHA1 Message Date
Peter Simons
b1f7180d6c Merge pull request #1188 from peti/reimplement-ghcWithPackagesOld-by-wrapping-ghcWithPackages
Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
2013-11-11 05:00:11 -08:00
Karn Kallio
1e80c57274 scala: add expression for scala 2.10.x branch. 2013-11-11 12:11:00 +01:00
Peter Simons
e4d841eef4 Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
This change is intended to fix <https://github.com/NixOS/nixpkgs/issues/1161>
and to address some of the concerns that come up during the discussion of
<d64917ad17>.
2013-11-09 20:41:52 +01:00
Peter Simons
981c287355 ghc: several enhancements to the new "with-packages" wrapper
1) The wrapper erroneously used the ghc-pkg flag "--package-db" instead of
    "--global-package-db". The result was that packages installed locally in
    ~/.ghc and ~/.cabal were invisible to GHC. This has been fixed.

 2) The wrapper now deals gracefully with an empty package set: if no package
    is requested to be included in the wrapped environment, the wrapper just
    installs a pristine GHC.

 3) Correctly configure the "docdir" path returned by ghc-paths.

 4) Added some comments that describe the idea behind our ghc-paths patches and
    gives users same sample shell code that can be used to import our special
    environment variables into the currently running shell, so that programs
    outside of the wrapped environment can use them, too.
2013-11-09 20:36:25 +01:00
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
Eelco Dolstra
77dc219127 gcc: Support FreeBSD 2013-11-06 10:41:02 +01:00
Eelco Dolstra
da426c7df5 Fix some meta.platforms attributes to build more stuff on Darwin 2013-11-05 10:46:59 +01:00
Peter Simons
0e831bd525 Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'. 2013-11-04 19:42:49 +01:00
Peter Simons
40a31df497 haskell-Elm: update to version 0.10.0.2 2013-11-01 14:20:11 +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
Peter Simons
19cfd3da63 haskell-Elm: update to version 0.10.0.1 2013-10-27 19:07:14 +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
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
cf08417baa haskell-Elm: update to version 0.10 2013-10-24 23:29:54 +02:00
Song Wenwu
b23741da34 Add smlnj-110.76
Based on patch by Marc Weber:
http://lists.science.uu.nl/pipermail/nix-dev/2010-December/005625.html

Close #1058.
2013-10-21 21:46:55 +03:00
Malcolm Matalka
ab744d2053 Add Ocaml 4.01.0.
Close #1065.
2013-10-19 18:07:20 +03:00
Peter Simons
b258b45a4f haskell-idris: update to version 0.9.9.3 2013-10-18 12:52:27 +02:00
Michael Raskin
75bb099867 Update Julia 2013-10-14 11:55:59 +04:00
Michael Raskin
6be28d142f Update SBCL to 1.1.12 2013-10-13 10:34:55 +04:00
Shea Levy
74d72d89ea Update edk2 and OVMF
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-09 10:30:44 -04:00
Rob Vermaas
2066508131 Add argument to oraclejdk to allow installation of Java Cryptography Extension with unlimited strength. User needs to download these themselves, and need to accept a license agreement (Java SE BCL License Agreement) 2013-10-08 11:31:12 +02:00
Domen Kožar
49f8e371a1 Merge pull request #1049 from bjornfor/description-fixes
More description fixes
2013-10-06 07:05:20 -07:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons
2e60cd53b7 Merge pull request #1046 from DriesVanDaele/master
add tabling to yap
2013-10-06 02:58:53 -07:00
Dries Van Daele
89964dd241 add tabling to yap 2013-10-05 20:59:34 +02:00
Bjørn Forsman
28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Moritz Ulrich
36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Peter Simons
a71c1ca748 haskell-idris: update to version 0.9.9.2 2013-09-25 18:25:00 +02:00
Peter Simons
900a35738c haskell-idris: update to version 0.9.9.1 2013-09-22 13:25:08 +02:00
Lluís Batlle i Rossell
41e95c68b3 go: adding an option to remove external references in godoc
godoc pages point to googleapis and google plus URLs, for every visit in
your local godoc. I added an option to disable that (the hard way, it
takes out the references). I don't think it removes any feature of
godoc.
2013-09-15 11:57:52 +02:00
Zef Hemel
8d001c1a08 Darwin support for Go 1.1 (close #952) 2013-09-14 15:13:26 +02:00
Peter Simons
da6b1e6d81 idris: re-generate with cabal2nix 2013-09-11 20:45:18 +02:00
Peter Simons
39043ce87e yap: add 'zlib' and 'gmp' build inputs to enable additional features 2013-09-11 20:43:04 +02:00
Dries Van Daele
412b970479 Update YAP to version 6.2.2 2013-09-11 19:40:10 +02:00
Dries Van Daele
3d5e7a99f4 Update SWI-Prolog to version 6.4.1 2013-09-11 19:00:31 +02:00
Vladimír Čunát
b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Ricardo M. Correia
6039f2effe go: update to 1.1.2
Also fix impurity in src/pkg/net/lookup_unix.go.
2013-09-07 05:10:50 +02:00
Evgeny Egorochkin
bf82983581 Merge pull request #926 from grwlf/urweb-2013
Ur/Web: Version bump
2013-09-06 15:51:24 -07:00
Sergey Mironov
190dcbbc7a Ur/Web: Version bump 2013-09-07 00:36:40 +04:00
Vladimír Čunát
2fda1165da Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
Bjørn Forsman
a74ab8c0a1 cudatoolkit: fix missing dependencies
Some of the java tools failed to run (notably nsight) because of missing
libraries. This fixes it.
2013-08-27 14:11:23 +02:00
Justin Bedo
6c2985e8d7 Update CUDA Toolkit to 5.5 2013-08-27 13:44:56 +02:00
Peter Simons
95491128cf gprolog: update to version 1.4.4, clean up installation layout, update license information 2013-08-27 13:21:29 +02:00
Vladimír Čunát
c1e62e7e91 Merge branch 'master' into x-updates 2013-08-22 19:29:09 +02:00
Petr Rockai
8bc805a211 llvm: Build the LLVMgold.so plugin for ld.gold &c.
Conflicts (simple):
	pkgs/development/compilers/llvm/default.nix
2013-08-18 21:35:17 +02:00
Peter Simons
898348a80d ghc-head: update to version 7.7.20130816 2013-08-16 23:47:59 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00