Ryan Trinkle
90d5d315af
hmatrix: fix missing Accelerate framework dependency on darwin
2015-11-15 14:57:58 -05:00
Ryan Trinkle
5d4595621d
mariadb: fix missing CoreServices framework dependency on darwin
2015-11-15 14:57:06 -05:00
Ryan Trinkle
82bd3a5580
Do not use install_name_tool on "executables" built by GHCJS
...
These executables are really .jsexe directories, and install_name_tool will fail
2015-05-31 03:18:13 -04:00
Ryan Trinkle
363259acec
Pull submodules of the ghcjs-boot repository recursively
...
Without this, the result will not match the sha256 provided
2015-01-11 18:03:45 -05:00
Ryan Trinkle
20710afb46
Use Cabal_1_22_0_0 instead of Cabal_HEAD in cabalJs
...
Cabal_HEAD no longer exists. When Cabal_1_22_0_0 or later becomes the default, this should be updated again to point to Cabal
2015-01-09 08:29:56 -05:00
Ryan Trinkle
e50802323c
Work around issues that appear when compiling the 'split' and 'dependent-map' packages with ghcjs
2015-01-02 14:25:16 -05:00
Ryan Trinkle
b1e967958e
Eliminate incorrect version checks from cabalJs
2015-01-02 12:30:19 -05:00
ryantrinkle
36445e73b7
Merge pull request #6 from cstrahan/ryghcjs
...
purify ghcjs
2014-12-14 10:49:37 -05:00
Ryan Trinkle
a2d4a415d3
Bump the version of ghcjs-dom to support newer version of text
2014-12-10 11:42:38 -05:00
ryantrinkle
85a4f28375
Merge pull request #5 from basvandijk/update
...
Merge upstream master
2014-12-05 14:12:01 -05:00
Ryan Trinkle
21566e7c56
Remove outdated ghcjs nix expression
2014-12-01 08:09:35 -05:00
ryantrinkle
7d2bba88da
Merge pull request #4 from basvandijk/update-ghcjs
...
Update Cabal-ghcjs and ghcjs-boot
2014-12-01 07:05:31 -05:00
ryantrinkle
ec3ea85bb0
Merge pull request #3 from basvandijk/update-ghcjs
...
Update ghcjs
2014-11-30 12:35:52 -05:00
ryantrinkle
3973b89247
Merge pull request #2 from basvandijk/update-ghcjs
...
Update ghcjs && and remove deprecation warning
2014-11-29 12:12:00 -05:00
Ryan Trinkle
ed6bfa2318
Update ghcjs
2014-11-17 01:08:11 -05:00
Ryan Trinkle
aa71f5ff77
Update ghcjs
2014-10-09 10:54:27 -04:00
Ryan Trinkle
9ec240605d
Use optparse-applicative 0.9.1.1; 0.10 doesn't export 'reader', which causes ghcjs to fail to build
2014-10-07 21:34:31 -04:00
Ryan Trinkle
92f8d68b99
Merge branch 'master' of https://github.com/NixOS/nixpkgs
...
Conflicts:
pkgs/development/libraries/haskell/ghcjs-dom/default.nix
pkgs/top-level/haskell-packages.nix
2014-10-06 13:12:58 -04:00
Ryan Trinkle
e4ff3fd348
Add defaultSetupHs to ghcjs, and fix it in regular cabal
2014-09-20 18:54:09 -04:00
Ryan Trinkle
c1c4c85800
Fix ghcjsDom's compiler detection
2014-08-30 21:46:25 -04:00
Ryan Trinkle
68648f5581
Merge branch 'ghcjs-old' into HEAD
...
Conflicts:
pkgs/development/tools/haskell/ghcjs/default.nix
2014-08-30 16:30:58 -04:00
Ryan Trinkle
ceabc66ce2
Add support for webkit builds to haskellPackages.ghcjsDom
2014-08-29 22:08:18 -04:00
Ryan Trinkle
0c32671b45
Merge branch 'ghcjs' into ghcjs-rebase
2014-08-27 15:38:57 -04:00
Ryan Trinkle
ebf364acfc
Fix ca-bundle.crt file location.
2014-08-27 13:39:04 -04:00
Ryan Trinkle
fa211963ed
Another try at fixing the install_name_tool issue.
2014-08-27 13:23:10 -04:00
Ryan Trinkle
bc92dcd08c
Prevent install_name_tool from causing a failure when it encounters a non-Mach-O file (e.g.: a bash script).
2014-08-27 13:15:33 -04:00
Ryan Trinkle
81a5395c23
Ensure regex-posix is available to build ghcjs even if tests are disabled.
2014-08-27 12:27:42 -04:00
Ryan Trinkle
00b108871d
...
2014-08-27 12:14:42 -04:00
Ryan Trinkle
6f2b53400d
Add a temporary workaround for https://github.com/NixOS/nixpkgs/issues/3540
2014-08-27 11:18:22 -04:00
Ryan Trinkle
17ce6ccef0
Add temporary workaround for https://github.com/NixOS/nixpkgs/issues/2689
2014-08-27 10:36:10 -04:00
Ryan Trinkle
4394858433
Integrate ghcjs
...
Use nixpkgs.haskellPackages_ghcjs to build packages with ghcjs.
2014-08-26 13:35:29 -04:00
Ryan Trinkle
3e62d0b540
Fix buildLocalCabalWithArgs.
2014-08-25 18:47:02 -04:00
Ryan Trinkle
1c9166f649
Factor out ghcjs's libdir better.
2014-08-25 18:46:52 -04:00
Ryan Trinkle
983af4a921
Use variables for ca-bundle.crt and GHCJS_LIBDIR.
2014-08-25 18:17:18 -04:00
Ryan Trinkle
a5e6027ece
Get rid of debugging output.
2014-08-24 16:27:44 -04:00
Ryan Trinkle
6142b27760
ghcjs working.
2014-08-23 15:00:13 -04:00
Ryan Trinkle
df0e96175c
ghcjs is mostly working.
2014-08-21 14:56:04 -04:00
Ryan Trinkle
1a0e674694
Merge branch 'master' into ghcjs-old
2014-08-17 22:05:16 -04:00
Ryan Trinkle
50275ff2ee
Make the version number match the cabal file's version number.
...
This is necessary because otherwise the linker flags given at pkgs/build-support/cabal/default.nix:201-203 are ineffective, which causes the built binary to be unable to find its .so file at runtime. This appears to only affect executables that are built in the same cabal package as the library they require.
2014-07-05 17:08:41 -04:00
Ryan Trinkle
4e7aa4be87
Make ghcjs build.
...
Note: In order to run ghcjs, you must set LD_LIBRARY_PATH=${ghcjs}/lib/ghc-7.8.2/ghcjs-0.1.0:$LD_LIBRARY_PATH so that it can find libHSghcjs-0.1.0-ghc7.8.2.so
* ghcjs itself (as opposed to ghcjs-built libraries) must be built with the non-ghcjs version of cabal. I'm not sure whether this is strictly necessary, but it prevented an error.
* CabalGhcjs and cabalInstallGhcjs must be explicitly provided to ghcjs-boot
* Since ghcjs-boot writes to its home directory, we set the home directory to our working directory
* To enable ghcjs-boot to find a particular .h file, we must create a symlink in ghcjs-boot/boot to its parent directory
* gmp must be provided. Adding it to the LD_LIBRARY_PATH is necessary, but I am not sure whether the uses in buildDepends and the arguments to ghcjs-boot are necessary
* If ghcjs-boot cannot find the shims package, it will attempt (and fail) to download it, so we must put it in place ahead of time
2014-06-30 00:49:35 -04:00
Ryan Trinkle
632ccf8bc6
Merge branch 'master' of https://github.com/NixOS/nixpkgs
2014-06-07 23:29:48 -04:00
Ryan Trinkle
2f4517697e
Add ssl support to snapServer package.
2014-06-04 14:29:18 +00:00