Commit Graph

141 Commits

Author SHA1 Message Date
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
sternenseemann
a5b5d65b5b haskell.compiler.ghcjs: provide required ansi-wl-pprint < 0.7
Unfortunately the outdated version of optparse-applicative we need to
use hasn't survived the ansi-wl-pprint deprecation…
2024-04-27 10:28:45 +02:00
Sergei Trofimovich
cba7eafc01 haskell.compiler.ghcjs: expose llvmPackages attribute via passthru
Files like `pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix`
assume `ghc` always has an `llvmPackages` attribue. Let's expose `null`
value from `ghcjs` to allow it's propagation.

This fixes package evaluation for `ghcjs` packages.
2024-01-04 00:34:19 +01:00
Naïm Favier
44f30edf56
haskell.compiler.ghcjs: fix build (#228749)
Apply a patch from upstream `ghcjs/ghcjs/ghc-8.10` (not yet present in
the obsidiansystems fork we follow) to fix a build failure caused by an
emscripten update.

As the patch itself modifies patches that are used during configuration
(by `makePackages.sh`), it must be applied in the configured source derivation.
2023-05-02 11:46:08 +02:00
sternenseemann
0c761f74f0 haskell.compiler.ghcjs: allow building with transformers-compat-0.7
ghcjs's dependency optparse-applicative 0.15.1.0 restricts
transformers-compat to < 0.7 which is unnecessary.
2022-12-30 12:47:20 +01:00
sternenseemann
00ca09719c haskell.compiler.ghcjs: drop stale override for webdriver
webdriver-0.10.0.0 incorporated the changes we are interested.
2022-12-30 12:46:53 +01:00
Joachim Breitner
8c77993daf haskell.packages.ghcjs.ghcjs-base: 0.2.0.3 → 0.2.1.0
the new upstream release makes it build with aeson-2.0.
2022-06-13 10:34:00 +02:00
sternenseemann
fde2e98a01 haskell.compiler.ghcjs: fix build with aeson 2.0 2022-04-11 01:26:04 +02:00
Felix Buehler
da2cbf54e8 haskellPackages.ghcjs-base_0_2_0_3: switch to fetchFromGitHub 2022-03-29 13:06:21 +02:00
Lucas Hoffmann
47190314df treewide: replace defunct git://github.com urls with https://
Github has removed support for git://github.com and recommends
https://github.com instead.

See https://github.blog/2021-09-01-improving-git-protocol-security-github/
2022-03-25 11:21:42 +01:00
Ben Siraphob
0f050a1236
treewide: replace http://github.com with https://github.com 2022-01-07 09:58:36 +07:00
John Ericson
96a0040313
Merge pull request #151689 from Gabriel439/gabriella/fix_ghcjs_config.sub
haskell.compiler.ghcjs: Don't use upstream `config.sub`
2021-12-22 12:02:13 -05:00
Gabriella Gonzalez
0796ca8425
haskell.compiler.ghcjs: Fix Linux build (#151699)
Before this change the GHCJS build fails on Linux with:

```
Setup: Missing dependency on a foreign library:
* Missing (or bad) header file: ghc/utils/unlit/fs.h
```

The root cause is that the `./ghc/configure.ac` script is
responsible for copying `./ghc/utils/fs/fs.h` to
`./ghc/utils/unlit/fs.h`, but the script exits early if a C
compiler is not present.

This fixes that by ensuring that the C compiler is present
on all platforms (not just Darwin), so that the build now
works on Linux, too.
2021-12-22 08:43:38 -08:00
Gabriella Gonzalez
69125bc160 haskell.compiler.ghcjs: Don't use upstream config.sub
Before this change the `ghcjs` build fails with:

```
checking host system type... Invalid configuration `js-ghcjs': machine `js-unknown' not recognized
configure: error: …/bin/bash …/configured-ghcjs-src/lib/boot/pkg/unix/config.sub js-ghcjs failed
```

This fails because the `updateAutotoolsGnuConfigScriptsHook` overrides the
`config.sub` in the `unix` boot package to use the newer upstream
version of `config.sub`, but the newer version is incompatible with the
`js-ghcjs` host string used to configure the `unix` package.  The
fix is to undo the override, because the `config.sub` vendored within
`ghc` supports the host string correctly.
2021-12-21 21:22:58 -08:00
sternenseemann
e8f9f6efb6 haskell.compiler.ghcjs: fix evaluation regression
The treewide change 8547db919a was done
incorrectly for ghcjs. This hasn't been noticed so far due to a lack of
CI.
2021-11-15 21:03:33 +01:00
github-actions[bot]
ab4eda8513
Merge master into haskell-updates 2021-11-05 00:07:13 +00:00
Sandro Jäckel
8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
Daniel Smith
742d75c5bc ghcjs: remove duplicate vector patch
Allows vector to be built with ghcjs
2021-10-23 15:51:56 -07:00
Divam Narula
d032f60c37
ghcjs: Enable on darwin (#139067) 2021-09-26 00:51:46 -04:00
(cdep)illabout
3389aab889
haskell.compiler.ghcjs: mark hydraPlatforms as none because output is too large 2021-09-19 09:32:17 +09:00
Divam
ba25b274f4 ghcjs: init at 8.10.7
The src points to the obsidiansystems repo as it has the ghcjs ported from
8.10.5 to 8.10.7, and a bunch of other fixes (#812, #811, #809)
2021-09-15 12:51:34 +09:00
Peter Simons
6966609104 Drop obsolete ghcjs-8.4.x code.
The 8.4.x version of ghcjs hasn't compiled successfully
in ages, so I reckon it's unused. The even older code
in pkgs/development/compilers/ghcjs is unused entirely;
it's not even referenced in Nixpkgs.
2019-09-30 12:48:24 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Peter Simons
2f0de54ddb Drop obsolete GHC versions 7.10.3, 8.0.2, and 8.4.3.
We keep the latest minor release of each one of the last 3 major releases,
which currently are GHC versions 8.2.2, 8.4.4, and 8.6.1. We also have
ghc-HEAD, but this doesn't count.

Dropping these compilers implied that we have to drop the corresponding
versions of ghcjs, too. We can also drop a shitload of obsolete compiler
patches that newer versions no longer need.

At some point, we can probably simplify the generic builder, too.
2018-11-02 20:13:55 +01:00
John Ericson
d892f1aa90 ghcjs-*: Expose the version of GHC used
This is more meaningful than the GHCJS version for most tasks.
2018-09-28 12:06:31 -04:00
John Ericson
94d12f3e7c ghcjs-{7.10, 8.0}: Make symmetrical
There's no reason other than misleading branch names to prefer one over
another.
2018-09-27 18:37:10 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer
fd7a6ea0af haskell: make generic builder follow compiler’s shared config
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.

Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
2018-06-20 18:40:53 -04:00
Matthew Bauer
a9400e64e7 ghcjs: add version to haskellCompilerName
This is needed for some cabal2nix stuff in getting the version.
Previously we had left out the version but apparently this can cause
problems in some scenarios.

/cc @elvishjerricco @peti @ericson2314
2018-06-14 11:38:13 -04:00
Peter Simons
935526e181
Merge pull request #38288 from ElvishJerricco/elvishjerricco-ghcjs-maintainer
Added ElvishJerricco to GHCJS maintainers
2018-04-06 10:54:57 +02:00
Peter Simons
97e891aee0
Merge pull request #38314 from ElvishJerricco/fix-ghcjs-7.10
Fix GHCJS 7.10
2018-04-03 18:15:44 +02:00
Will Fancher
5da837ad9c GHCJS: Fix GHCJS with haddock-library-1.4.3 2018-04-02 00:23:32 -04:00
Will Fancher
774253e56b Fix GHCJS 7.10 2018-04-01 23:25:37 -04:00
Will Fancher
c6a9e3a911 Added ElvishJerricco to GHCJS maintainers 2018-04-01 03:58:45 -04:00
Peter Simons
0e82924474 ghcjs: mark HEAD version as broken 2018-03-29 20:46:31 +02:00
Peter Simons
3d8694ee2d ghcjs: mark build broken 2018-03-05 16:44:23 +01:00
Will Fancher
fcc8cae88d Fixed GHCJS 2018-01-20 15:47:59 -05:00
Jude Taylor
d2734eead9 fix typo 2018-01-08 10:31:12 -08:00
Jude Taylor
a19e258707 let ghcjs packages compile with new cross-compiling 2018-01-08 10:30:15 -08:00
Peter Simons
8d8061ec20
Revert "Revive multiple outputs for Haskell packages." 2017-12-05 09:36:08 +01:00
Nicholas Clarke
d90165c7db Revert "Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out""
This reverts commit 89f5d52cf4.
2017-11-27 16:05:22 +00:00
Pascal Wittmann
24e87b49b6
Change many homepage urls from http to https #30636 2017-11-10 22:13:46 +01:00
Jude Taylor
737b466031 fix ghcjs socket.io 2017-11-01 12:16:48 +01:00
Moritz Kiefer
d222538732 ghcjs: Do not mark as broken
This has been fixed in #30214
2017-10-21 13:27:42 +01:00
Peter Simons
f9090c3332 Merge pull request #30214 from cocreature/ghcjs
ghcjs/ghcjsHEAD: Use separate patch files to fix build of ghcjs
2017-10-17 10:44:37 +01:00
Peter Simons
6a84b39950 ghcjs: mark build as broken 2017-10-09 17:25:57 +02:00
Moritz Kiefer
78aa7f2338 ghcjs/ghcjsHEAD: Use separate patch files to fix build of ghcjs 2017-10-08 11:26:25 +02:00
Moritz Kiefer
582c7d24fc ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions
head_stage2.nix has been regenerated to reflect changes in ghcjs
2017-09-23 18:56:54 +02:00