diff options
| author | Dennis Gosnell <cdep.illabout@gmail.com> | 2022-06-16 13:34:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-16 13:34:30 +0900 |
| commit | 2533b1a2a6244d63b7e39505befb275338fae9c7 (patch) | |
| tree | 26105290322ac227b0a58ff84ddd4ec1b34d5257 /pkgs | |
| parent | 4bcc666196ecc00f99da5823acbf348f43498386 (diff) | |
| parent | 8c77993daf675ca3fb00ee0bd85a8ab95f27fc93 (diff) | |
| download | nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.tar nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.tar.gz nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.tar.bz2 nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.tar.lz nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.tar.xz nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.tar.zst nixpkgs-2533b1a2a6244d63b7e39505befb275338fae9c7.zip | |
Merge pull request #177489 from nomeata/joachim/ghcjs-base
haskell.packages.ghcjs.ghcjs-base: 0.2.0.3 → 0.2.1.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/ghcjs-base.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-base.nix b/pkgs/development/compilers/ghcjs/ghcjs-base.nix index b0c604a4aea..9c09412b027 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-base.nix +++ b/pkgs/development/compilers/ghcjs/ghcjs-base.nix @@ -8,12 +8,14 @@ }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.0.3"; + version = "0.2.1.0"; + # This is the release 0.2.1.0, but the hackage release misses test source files, + # so lets use github https://github.com/ghcjs/ghcjs-base/issues/132 src = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs-base"; - rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2"; - sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU="; + rev = "fbaae59b05b020e91783df122249095e168df53f"; + sha256 = "sha256-x6eCAK1Hne0QkV3Loi9YpxbleNHU593E4AO8cbk2vUc="; }; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers deepseq dlist diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 0578c3f677f..94a173c049b 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -18,6 +18,7 @@ self: super: inherit (self.ghc.bootPkgs) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; + # Test suite fails; https://github.com/ghcjs/ghcjs-base/issues/133 ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix { fetchFromGitHub = pkgs.buildPackages.fetchFromGitHub; aeson = self.aeson_1_5_6_0; @@ -36,6 +37,9 @@ self: super: # nodejs crashes during test ChasingBottoms = dontCheck super.ChasingBottoms; + # runs forever + text-short = dontCheck super.text-short; + # doctest doesn't work on ghcjs, but sometimes dontCheck doesn't seem to get rid of the dependency doctest = pkgs.lib.warn "ignoring dependency on doctest" null; |