diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-28 15:30:15 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 22:14:42 +0000 |
commit | 80e4dc93ce4bb109cd00a98f0b39151f09de9d9b (patch) | |
tree | 64aa611a6a199dc0f40fc56d050d99e125e5c830 /nixpkgs/pkgs/development/compilers/ghcjs-ng | |
parent | bfa679f5a8e9beff6008ea0e9d5eabfa68018e20 (diff) | |
parent | 2436c27541b2f52deea3a4c1691216a02152e729 (diff) | |
download | nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.gz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.bz2 nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.lz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.xz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.zst nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.zip |
Merge commit '2436c27541b2f52deea3a4c1691216a02152e729'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ghcjs-ng')
5 files changed, 12 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index 53b6dd431342..c54c782fafa6 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -2,6 +2,10 @@ let inherit (haskellLib) doJailbreak dontHaddock; in self: super: { + ghc-api-ghcjs = super.ghc-api-ghcjs.override + { + happy = self.happy_1_19_5; + }; haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); } diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json index 37861b96e7aa..1114e1a12905 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json @@ -1,6 +1,6 @@ { "url": "https://github.com/ghcjs/ghcjs", - "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075", - "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj", + "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874", + "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy", "fetchSubmodules": true } diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index a89ab15c55fd..b957a6aa9e10 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -59,20 +59,21 @@ }) {}; ghc-api-ghcjs = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers + ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs + , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs , terminfo, time, transformers, unix }: mkDerivation { pname = "ghc-api-ghcjs"; - version = "8.6.2"; + version = "8.6.5"; src = configuredSrc + /lib/ghc-api-ghcjs; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process template-haskell-ghcjs terminfo time transformers unix ]; + libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; description = "The GHC API (customized for GHCJS)"; license = stdenv.lib.licenses.bsd3; @@ -107,7 +108,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "https://github.com/ghcjs"; + homepage = "http://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index 52f3ad497ad6..00a071651eda 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -1,8 +1,7 @@ -{ haskellLib, alex, happy }: +{ haskellLib }: let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; in self: super: { - ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; system-fileio = doJailbreak super.system-fileio; diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix index 068d7b578dfe..e668be8e0740 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix @@ -34,7 +34,6 @@ let (callPackage ./common-overrides.nix { inherit haskellLib; - inherit (bootPkgs) alex happy; }) ghcjsDepOverrides ]); |