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: d2ac9b192a9f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 42b3b7ab3552
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 5, 2017

  1. ghcjsHEAD: bump git revision 

    This particular revision brings significant performance improvements
when building code that uses TemplateHaskell.
    @k0001
    k0001 committed Jun 5, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0c68a1 View commit details

  2. Merge branch 'bump-ghcjs' of git://github.com/k0001/nixpkgs

    @shlevy
    shlevy committed Jun 5, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    42b3b7a View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/compilers/ghcjs/head.nix
6 changes: 3 additions & 3 deletions pkgs/development/compilers/ghcjs/head.nix
View file
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ bootPkgs.callPackage ./base.nix {
ghcjsSrc = fetchFromGitHub {
# TODO: switch back to the regular ghcjs repo
# when https://github.com/ghcjs/ghcjs/pull/573 is merged.
owner = "basvandijk";
owner = "k0001";
repo = "ghcjs";
rev = "e6cdc71964a1c2e4184416a493e9d384c408914c";
sha256 = "00fk9qwyx4vpvr0h9jbqxwlrvl6w63l5sq8r357prsp6xyv5zniz";
rev = "600015e085a28da601b65a41c513d4a458fcd184";
sha256 = "01kirrg0fnfwhllvwgfqjiwzwj4yv4lyig87x61n9jp6y5shzjdx";
};
ghcjsBootSrc = fetchgit {
# TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git