Ryan Trinkle
3ae9bf6d0e
v42lloopback: 0.11 -> 0.12
2018-10-08 15:00:13 -04:00
Ryan Trinkle
7ca34b2bdd
azure-cli: delete empty nix file
2018-07-25 16:27:12 -04:00
Ryan Trinkle
fe04fe868b
Fix gradle build
2018-06-11 13:25:54 -04:00
Ryan Trinkle
c425a1fc50
haskell: add *FrameworkDepends arguments
2018-05-31 14:04:10 -04:00
Ryan Trinkle
4f25cf5124
ncurses: when cross-compiling for iOS, use built-in ncurses
2018-05-16 14:28:25 -04:00
Ryan Trinkle
1034aa8e9c
Merge pull request #25148 from obsidiansystems/docker-dirlinks
...
dockerTools: optionally preserve directory symlinks
2018-04-09 17:44:09 -04:00
Ryan Trinkle
998a19e854
syslog-ng: enable SMTP destination
2018-03-22 19:23:19 -04:00
Ryan Trinkle
bd0de2f1cb
ghc: Fix env vars and configure flags to be weird
...
GHC currently handles this stuff in a quite non-standard way, basically
taking prog var `FOO` to mean `FOO_FROM_TARGET`. It's because it
(wrongly) thinks from stage 2's perspective.
2018-01-21 23:31:03 -05:00
Ryan Trinkle
e1e5860ab5
Merge pull request #33346 from ryantrinkle/init-thunderbolt
...
Init thunderbolt at 0.9.2
2018-01-03 17:31:57 -05:00
Ryan Trinkle
f1a6fa6eec
Merge pull request #32258 from ryantrinkle/add-nat-extraCommands
...
nat: add extraCommands option
2018-01-02 14:32:42 -05:00
Ryan Trinkle
36fbcfd811
thunderbolt: init at 0.9.2
2018-01-02 14:28:56 -05:00
Ryan Trinkle
70cf769082
maintainers: add ryantrinkle
2018-01-02 14:27:20 -05:00
Ryan Trinkle
ab2b3a5d0a
nat: add extraCommands and extraStopCommands options
2017-12-06 11:17:38 -05:00
Ryan Trinkle
4f8a65a163
nixos/nat: add dmzHost option ( #32257 )
2017-12-04 09:21:58 +00:00
Ryan Trinkle
a8f1ebf52c
nat: support port ranges in networking.nat.forwardPorts
2017-12-02 13:28:01 -05:00
Ryan Trinkle
83048c4fe0
nixpkgs.lib: Add types.strMatching
2017-12-02 13:28:00 -05:00
Ryan Trinkle
6281eb123b
nixpkgs.lib: Add escapeNixString
2017-12-02 13:28:00 -05:00
Ryan Trinkle
ded1281f45
Merge branch 'master' into docker-dirlinks
2017-11-03 10:53:00 -04:00
Ryan Trinkle
160685725e
haskell-packages: fix all-cabal-hashes component lookup
...
Previously, if a package name in a later component was a substring of a package name in an earlier component, the earlier component would be selected due to a partial-name match. This commit prevents partial matches.
2017-10-24 09:43:29 -04:00
Ryan Trinkle
f08d6f0e2d
webkitgtk-2.16: move sqlite from nativeBuildInputs to buildInputs
2017-09-28 12:17:37 -04:00
Ryan Trinkle
c955c86fd9
geoclue-2.0: move pkgconfig from buildInputs to nativeBuildInputs
2017-09-28 12:17:25 -04:00
Ryan Trinkle
20ba83a196
audiofile: move alsaLib from nativeBuildInputs to buildInputs
2017-09-28 12:17:09 -04:00
Ryan Trinkle
7004641566
Merge pull request #26974 from obsidiansystems/response-file-parsing-speed
...
cc-wrapper: improve response file parsing speed
2017-07-05 16:18:22 -04:00
Ryan Trinkle
754c3f6ba4
cc-wrapper: fix response file parsing on ios-cross
2017-07-05 16:04:39 -04:00
Ryan Trinkle
aad0ebb194
cc-wrapper: expand-response-params: fix parsing of quotes that are quoted and escaped
2017-07-03 23:16:10 -04:00
Ryan Trinkle
d07f30f628
cc-wrapper: improve response file parsing speed
2017-06-30 15:20:53 -04:00
Ryan Trinkle
0916c26ed6
symlinkJoin: eliminate lndir spam
...
By default lndir outputs the name of each subdirectory as it descends into it; this commit gives it the -silent flag to disable this behavior
2017-05-27 16:19:34 -04:00
Ryan Trinkle
1927361e44
gi-webkit2: fix gi-javascriptcore dependency
2017-05-01 15:21:57 -04:00
Ryan Trinkle
dce2c258ac
dockerTools: optionally preserve directory symlinks
...
In some cases, this seems to save a lot (>40%) of space.
2017-04-23 09:45:21 -04:00
Ryan Trinkle
c192f77b2b
dbvisualizer: 9.5 -> 9.5.7
2017-04-16 17:34:22 -04:00
Ryan Trinkle
928341132e
openfire: fix service expression
...
openfire is not in scope
2016-10-19 11:06:07 -04:00
Ryan Trinkle
92d21f1115
Merge pull request #17314 from ryantrinkle/ghcjs-cabal-3494
...
ghcjs: work around haskell/cabal#3494
2016-07-27 16:35:39 -04:00
Ryan Trinkle
bf6fdae0f2
ghcjs: work around haskell/cabal#3494
...
See also NixOS/nixpkgs#16144
2016-07-27 14:34:12 -04:00
Ryan Trinkle
5a622db103
ghcjs: move list of stage 1 packages into ghcjs derivation
...
This makes it easier to ensure that the list of stage 1 packages accurately matches the given version of ghcjs, and makes it possible for this list to be overridden
2016-07-27 14:28:31 -04:00
Ryan Trinkle
676a7b698f
ghcjs: fix build
...
We need to hold back some packages, now that ghc 8 is out
2016-07-27 12:27:13 -04:00
Ryan Trinkle
0905aea14e
Merge pull request #17276 from ryantrinkle/ghcjs-8.0-support
...
ghcjs: refactor stage2 handling
2016-07-27 12:26:45 -04:00
Ryan Trinkle
c564997ba0
ghcjs: refactor stage2 handling
...
Previously, the stage2 information was stored in haskell-modules, and imported directly from there. However, the correct stage2 information is determined by the version of ghcjs-boot repository. This commit makes the stage2 information part of the ghcjs derivation, which improves organization and makes it possible to override stage2 when overriding ghcjs.
2016-07-26 16:58:56 -04:00
Ryan Trinkle
e3417b0f71
Merge pull request #15375 from ryantrinkle/ghc8-ghcjs-prim
...
ghc8 | config: ghcjs-prim: init at 0.1.0.0
2016-05-10 20:39:04 -04:00
Ryan Trinkle
2bae6b6737
ghc8 | config: ghcjs-prim: init at 0.1.0.0
2016-05-10 20:01:09 -04:00
Ryan Trinkle
8605dab964
webkitgtk: add darwin support
2016-03-30 09:40:36 +02:00
Ryan Trinkle
be30ba8e0e
nix-prefetch-scripts: make nix-prefetch-git report fetchSubmodules in its JSON output
...
Previously, nix-prefetch-git would report the same JSON whether submodules were being fetched or not; with this change, the --fetch-submodules option will cause the JSON output to include "fetchSubmodules": true, so that fetchgit (builtins.fromJSON (builtins.readFile ./path/to/output.json)) will work.
2016-03-21 23:26:18 -04:00
Ryan Trinkle
440b301d0a
Merge pull request #13931 from mightybyte/unix-compat-needs-libiconv
...
ghcjs: on Darwin, build unix-compat with libiconv
2016-03-15 01:11:02 -04:00
Ryan Trinkle
55720db388
ghcjs: Make ghcjs-boot source code overridable
2016-02-24 16:29:13 -05:00
Ryan Trinkle
5729cf7714
mariadb: 10.1.8 -> 10.1.9
...
Fixes build on darwin; might be related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777996;msg=2
2015-12-07 13:21:25 -05:00
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