Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b02b4648528e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7a23f1accacc
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 29, 2018

  1. GHCJS darwin fixes (#41120) 

    * GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
    @ElvishJerricco @xeji
    ElvishJerricco authored and xeji committed May 29, 2018
    Copy the full SHA
    7a23f1a View commit details
Showing with 9 additions and 3 deletions.
  1. +7 −1 pkgs/development/compilers/ghcjs-ng/default.nix
  2. +2 −2 pkgs/top-level/haskell-packages.nix
8 changes: 7 additions & 1 deletion pkgs/development/compilers/ghcjs-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,9 @@
, xorg
, gmp
, pkgconfig
, gcc
, lib
, nodePackages
, ghcjsDepOverrides ? (_:_:{})
}:

@@ -40,6 +42,8 @@ let
inherit (bootGhcjs) version;
isGhcjs = true;

socket-io = nodePackages."socket.io";

# Relics of the old GHCJS build system
stage1Packages = [];
mkStage2 = _: {};
@@ -49,7 +53,7 @@ let
libexec =
if builtins.compareVersions bootGhcjs.version "8.3" <= 0
then "${bootGhcjs}/bin"
else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
else "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";

in stdenv.mkDerivation {
name = "ghcjs";
@@ -63,6 +67,8 @@ in stdenv.mkDerivation {
xorg.lndir
gmp
pkgconfig
] ++ lib.optionals stdenv.isDarwin [
gcc # https://github.com/ghcjs/ghcjs/issues/663
];
phases = ["unpackPhase" "buildPhase"];
buildPhase = ''
4 changes: 2 additions & 2 deletions pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -159,13 +159,13 @@ in rec {
ghcjs = packages.ghcjs82;
ghcjs710 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs;
ghc = bh.compiler.ghcjs710;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};
ghcjs80 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjsHEAD;
ghc = bh.compiler.ghcjs80;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};