Commit Graph

77 Commits

Author SHA1 Message Date
Sergei Trofimovich
b4dc0f7158 haskell.packages.ghcjs.stm: fix eval
Without the change eval fails as:

    $ nix build --no-link -f. haskell.packages.ghcjs.stm
    error:
       … in the left operand of the update (//) operator
         at pkgs/development/haskell-modules/lib/compose.nix:40:7:
           39|     mkDerivation = drv: (args.mkDerivation drv).override f;
           40|   })) // {
             |       ^
           41|     overrideScope = scope: overrideCabal f (drv.overrideScope scope);

       error: attribute 'stm_2_5_3_0' missing
       at pkgs/development/haskell-modules/configuration-ghcjs.nix:29:21:
           28|   # https://github.com/ghcjs/ghcjs/issues/676
           29|   stm = doJailbreak self.stm_2_5_3_0;
             |                     ^
           30|   exceptions = dontCheck self.exceptions_0_10_7;
       Did you mean stm_2_5_3_1?
2024-04-28 21:40:42 +01:00
Sergei Trofimovich
53ddfcdf9b haskell.packages.ghcjs: fix stm eval
Before the change an attempt to instantiate `stm` package failed as:

    $ nix build --no-link -f. haskell.packages.ghcjs.stm
    error:
       … in the left operand of the update (//) operator

         at /home/slyfox/dev/git/nixpkgs-haskell-updates/pkgs/development/haskell-modules/lib/compose.nix:40:7:

           39|     mkDerivation = drv: (args.mkDerivation drv).override f;
           40|   })) // {
             |       ^
           41|     overrideScope = scope: overrideCabal f (drv.overrideScope scope);

       error: attribute 'stm_2_5_1_0' missing

       at /home/slyfox/dev/git/nixpkgs-haskell-updates/pkgs/development/haskell-modules/configuration-ghcjs.nix:29:21:

           28|   # https://github.com/ghcjs/ghcjs/issues/676
           29|   stm = doJailbreak self.stm_2_5_1_0;
             |                     ^
           30|   exceptions = dontCheck self.exceptions_0_10_7;
       Did you mean stm_2_5_3_0?
2024-01-04 00:34:19 +01:00
Naïm Favier
a6f307ada4 haskell.packages.ghcjs: misc fixes
Various fixes I needed to build a project that depends on lens.
2023-05-09 18:13:50 +02:00
Christoph Bauer
e0cec52d57 haskell.packages.ghcjs.stm: 2.5.0.2 -> stm 2.5.1.0
The stm_2_5_0_2 attribute was removed due to a package update upstream,
leading to an evaluation failure in the ghcjs package set.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
2022-11-01 12:52:44 +01:00
Dennis Gosnell
2533b1a2a6
Merge pull request #177489 from nomeata/joachim/ghcjs-base
haskell.packages.ghcjs.ghcjs-base: 0.2.0.3 → 0.2.1.0
2022-06-16 13:34:30 +09: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
libjared
81b8cb8624 haskell.packages.ghcjs.ghcjs-base: fix build
The latest aeson doesn't build in ghcjs because it includes text-short
in its dependency tree, which hangs on checkPhase because it uses C FFI.
But since ghcjs-base has an upper bound on aeson<1.6 anyway, just
override it.
2022-06-08 13:30:13 -05:00
Daniel Smith
912e427b52 ghcjs: use exceptions-0.10.5 instead of missing 0.10.4 2022-05-19 00:09:40 -04:00
sternenseemann
a964dcad73 haskell.compiler.ghcjs: pass fetchFromGitHub to ghcjs-base
Fixes evaluation of haskell.compiler.ghcjs.withPackages.

Reference #158600.
2022-04-05 12:50:04 +02:00
Gabriella Gonzalez
4e5a391e7e haskell.packages.ghcjs.stm: Fix evaluation error 2021-12-22 19:55:30 +01:00
Gabriella Gonzalez
bb976f4e86
haskell.packages.ghcjs.vector: Fix evaluation failure (#150002)
The derivation for the GHCJS `vector` package broke in #142940 due to
introducing the line of code that this change deletes.

The offending line appears to have been unintentionally added and
causes an evaluation failure for two separate reason :

* The argument order is wrong

  The change in #142940 switched the `haskellLib` utilities to flip
  their argument order, but the `appendPatch` in the offending line
  has the original argument order

* The patch file referenced by the offending line does not exist

The correct fix is to delete the line, because the patch is not
necessary.  The default version of the `vector` package is `0.12.3.1`,
which already includes the fix from that patch.
2021-12-11 12:04:13 -08:00
Ellie Hermaszewska
15ae25f36c
haskell: switch from haskell.lib to haskell.lib.compose 2021-11-07 20:18:45 +08: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
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
0ed2140a57 ghcjs: drop obsolete configuration file 2021-03-12 21:13:25 +01:00
Dominik Xaver Hörl
25bef2d8f9 treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 20:12:06 +01:00
Peter Simons
1c92cdaf74 configuration-ghcjs.nix: fix evaluation 2019-09-30 12:52:43 +02:00
Peter Simons
9de1461f45 haskell-stm: update overrides for the new 2.5.x version 2018-09-24 21:19:35 +02:00
Peter Simons
53d34305f6 haskell-stm: update overrides that use version 2.4.5.0 to version 2.4.5.1 2018-09-12 10:31:10 +02:00
Will Fancher
2781b1fcbc Fix ghcjs-dom-jsffi with GHCJS 8.4 2018-07-15 23:47:47 -04:00
Will Fancher
68ea661bb4 Fix various packages under GHCJS 2018-07-15 23:47:46 -04:00
Will Fancher
8488982ee3 Fixed some core packages in GHCJS 8.4 2018-07-15 22:41:27 -04:00
John Ericson
740cfffcb2 haskell infra: Fix built-time overrides
These should all come from `buildHaskellPackages`
2018-07-09 18:09:17 -04:00
Matthew Bauer
340bc74a2b ghcjs: remove old-time
This attribute is no longer available
2018-06-11 10:29:12 -04:00
Matthew Bauer
5a216cd7ed ghcjs: disable some checks 2018-06-10 15:07:02 -04:00
Sarah Brofeldt
19fa9b2e30 haskell.packages.ghcjs.terminfo: Bump version (#41337) 2018-06-01 19:19:09 +02:00
Will Fancher
774253e56b Fix GHCJS 7.10 2018-04-01 23:25:37 -04:00
Bas van Dijk
68e05a361d haskell: ghcjs packages: fix build of fail 2017-10-23 19:44:46 +02:00
John Ericson
74f5fe5068 haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

 - stdenv is exposed more shallowly so it can be overriden more easily.
   I'll eventually use this on Darwin to avoid the Sierra shared
   library problems (unless changes are to be made system-wide).

Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-03 13:12:01 +02:00
David Johnson
51edf3bf88 miso: init at 0.2.0.0 2017-07-12 18:47:18 +00:00
Leon Isenberg
7a08e57b9e haskell: ghcjs packages: Break dependency cycle less invasive
Between cabal and hscolour.
2017-04-07 19:02:52 +02:00
Leon Isenberg
2553ceb982 haskell: use GHCJS to build Setup.hs for GHCJS packages
Closes https://github.com/NixOS/nixpkgs/pull/23614.
2017-03-29 20:30:28 +02:00
Peter Simons
24a69286e9 Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit
haskellPackages: apply GHC specific overrides before GHCJS
2017-03-24 23:15:41 +01:00
Leon Isenberg
07905c8f93 haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal 2017-03-08 16:28:54 +01:00
Leon Isenberg
b9c7d291bc haskellPackages: apply GHC specific overrides before GHCJS
GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in
general apply to the GHCJS package sets, too.
2017-03-08 13:10:28 +01:00
Leon Isenberg
691b3bcd77 haskellPackages: fix dangling references
haskeline_0_7_2_1 -> haskline_0_7_3_1
terminfo_0_4_0_1 -> terminfo_0_4_0_2
2017-03-05 16:45:31 +01:00
Profpatsch
5373ca9712 haskell/ghcjs: fix ghcjs-ffiqq, add ghcjs-vdom (#20614)
Both experimental libraries that are in the ghcjs GitHub organization, but are
not yet officially released on hackage.
2016-12-06 23:24:42 +01:00
Rodney Lorrimar
de2f9d6719 haskellPackages.ghcjs-dom: Add overrides (#20474) 2016-11-21 20:51:59 +01:00
Profpatsch
06e0bac814 haskell/ghcjs: sort ghcjs packages alphabetically 2016-11-18 16:38:04 +01:00
Profpatsch
a7043808dd haskell/ghcjs: patch Safe out of fast-logger 2016-11-18 16:24:37 +01:00
Profpatsch
247d7c88d2 haskell.packages.ghcjs: fix entropy (#20446) 2016-11-18 16:17:14 +01:00
Bas van Dijk
79f6e39b93 cereal: fix build on ghcjs 2016-10-14 00:35:01 +02:00
Profpatsch
308cd1abad packages.ghcjs: fix a few packages
dependencies for http2 & semigroups
jailbreak for protolude
no docs for wai
2016-09-28 15:51:53 +02: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
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
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
Doug Beardsley
a0ecf9cee2 ghcjs: on Darwin, build unix-compat with libiconv 2016-03-15 12:07:59 +08:00
John Ericson
e4abe06b8a ghcjs: Use bootpkgs to override build tools, not hardcoded compiler's pgks 2016-03-06 12:39:12 -08:00
Jude Taylor
bd9f128cc2 add darwin.libiconv to ghcjs packages 2016-02-24 13:33:16 -08:00
Charles Strahan
516057ffa9 ghcjs: replace integer-simple with integer-gmp
GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
2016-02-18 18:32:58 -05:00