Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f5f9625bffac
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 33716c1d4b2f
Choose a head ref
  • 3 commits
  • 11 files changed
  • 2 contributors

Commits on Sep 27, 2018

  1. ghcjs-{7.10, 8.0}: Make symmetrical 

    There's no reason other than misleading branch names to prefer one over
another.
    @Ericson2314
    Ericson2314 committed Sep 27, 2018
    Copy the full SHA
    94d12f3 View commit details

  2. ghcjs-{7.10, 8.0}: Expose the good .override 

    The per-version `default.nix`es just fill in default arguments. It is
much more useful to have the `.override` from the inner `callPackage`,
for finer control. Converting the outer `callPackage` to a plain import
makes the inner one the only one, revealing its `.override`.
    @Ericson2314
    Ericson2314 committed Sep 27, 2018
    Copy the full SHA
    5ba8458 View commit details

  3. Merge pull request #47443 from obsidiansystems/ghcjs-no-double-callPa… 

    …ckage

ghcjs-{7.10, 8.0}: Improve overriding situation
    @Ericson2314
    Ericson2314 authored Sep 27, 2018
    Copy the full SHA
    33716c1 View commit details
0 pkgs/development/compilers/ghcjs/ghcjs.patch → ...velopment/compilers/ghcjs/7.10/boot.patch
View file
File renamed without changes.
50 changes: 50 additions & 0 deletions pkgs/development/compilers/ghcjs/7.10/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:

bootPkgs.callPackage ../base.nix {
version = "0.2.0";

inherit bootPkgs cabal-install;

ghcjsSrc = fetchFromGitHub {
owner = "ghcjs";
repo = "ghcjs";
rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
};
ghcjsBootSrc = fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git;
rev = "8c549931da27ba9e607f77195208ec156c840c8a";
sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
fetchSubmodules = true;
};

shims = import ./shims.nix { inherit fetchFromGitHub; };
stage1Packages = [
"array"
"base"
"binary"
"bytestring"
"containers"
"deepseq"
"directory"
"filepath"
"ghc-boot"
"ghc-boot-th"
"ghc-prim"
"ghci"
"ghcjs-prim"
"ghcjs-th"
"integer-gmp"
"pretty"
"primitive"
"process"
"rts"
"template-haskell"
"time"
"transformers"
"unix"
];
stage2 = import ./stage2.nix;

patches = [ ./boot.patch ];
}
0 pkgs/development/compilers/ghcjs/shims.nix → ...evelopment/compilers/ghcjs/7.10/shims.nix
View file
File renamed without changes.
0 pkgs/development/compilers/ghcjs/stage2.nix → ...velopment/compilers/ghcjs/7.10/stage2.nix
View file
File renamed without changes.
0 ...elopment/compilers/ghcjs/ghcjs-head.patch → ...evelopment/compilers/ghcjs/8.0/boot.patch
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions pkgs/development/compilers/ghcjs/head.nix → ...velopment/compilers/ghcjs/8.0/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:

bootPkgs.callPackage ./base.nix {
bootPkgs.callPackage ../base.nix {
version = "0.2.020170323";

inherit bootPkgs cabal-install;
@@ -18,7 +18,7 @@ bootPkgs.callPackage ./base.nix {
fetchSubmodules = true;
};

shims = import ./head_shims.nix { inherit fetchFromGitHub; };
shims = import ./shims.nix { inherit fetchFromGitHub; };
stage1Packages = [
"array"
"base"
@@ -44,7 +44,7 @@ bootPkgs.callPackage ./base.nix {
"transformers"
"unix"
];
stage2 = import ./head_stage2.nix;
stage2 = import ./stage2.nix;

patches = [ ./ghcjs-head.patch ];
patches = [ ./boot.patch ];
}
0 ...evelopment/compilers/ghcjs/head_shims.nix → ...development/compilers/ghcjs/8.0/shims.nix
View file
File renamed without changes.
0 ...velopment/compilers/ghcjs/head_stage2.nix → ...evelopment/compilers/ghcjs/8.0/stage2.nix
View file
File renamed without changes.
46 changes: 6 additions & 40 deletions pkgs/development/compilers/ghcjs/base.nix
View file
Original file line number Diff line number Diff line change
@@ -37,57 +37,23 @@
, coreutils
, libiconv

, version ? "0.2.0"
, ghcjsSrc ? fetchFromGitHub {
owner = "ghcjs";
repo = "ghcjs";
rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
}
, ghcjsBootSrc ? fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git;
rev = "8c549931da27ba9e607f77195208ec156c840c8a";
sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
fetchSubmodules = true;
}
, version
, ghcjsSrc
, ghcjsBootSrc
, ghcjsBoot ? import ./ghcjs-boot.nix {
inherit runCommand;
src = ghcjsBootSrc;
}
, shims ? import ./shims.nix { inherit fetchFromGitHub; }
, shims

# This is the list of the Stage 1 packages that are built into a booted ghcjs installation
# It can be generated with the command:
# nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'"
, stage1Packages ? [
"array"
"base"
"binary"
"bytestring"
"containers"
"deepseq"
"directory"
"filepath"
"ghc-boot"
"ghc-boot-th"
"ghc-prim"
"ghci"
"ghcjs-prim"
"ghcjs-th"
"integer-gmp"
"pretty"
"primitive"
"process"
"rts"
"template-haskell"
"time"
"transformers"
"unix"
]
, stage1Packages

, stage2 ? import ./stage2.nix

, patches ? [ ./ghcjs.patch ]
, patches

# used for resolving compiler plugins
, ghcLibdir ? null
5 changes: 0 additions & 5 deletions pkgs/development/compilers/ghcjs/default.nix
View file

This file was deleted.

8 changes: 6 additions & 2 deletions pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -80,13 +80,17 @@ in {
llvmPackages = pkgs.llvmPackages_5;
};
ghcjs = compiler.ghcjs84;
ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs {
# Use `import` because `callPackage inside`.
ghcjs710 = import ../development/compilers/ghcjs/7.10 {
bootPkgs = packages.ghc7103;
inherit (pkgs) cabal-install;
inherit (buildPackages) fetchgit fetchFromGitHub;
};
ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
# `import` on purpose; see above.
ghcjs80 = import ../development/compilers/ghcjs/8.0 {
bootPkgs = packages.ghc802;
inherit (pkgs) cabal-install;
inherit (buildPackages) fetchgit fetchFromGitHub;
};
ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
bootPkgs = packages.ghc822;