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
base: cf3ada04a77c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ec0c4802ae89
Choose a head ref
  • 17 commits
  • 20 files changed
  • 5 contributors

Commits on Jan 22, 2018

  1. ghc: Normalize derivations a bit before cross 

    These changes will affect the final derivation
    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    5a6b6b4 View commit details
    Browse the repository at this point in the history

  2. ghc: echo -n mk/build.mk to avoid extra line

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    1
    Copy the full SHA
    0eb3aca View commit details
    Browse the repository at this point in the history

  3. generic-builder: Make GHC a proper dependency 

    Rather than just sticking it on the PATH
    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    54ead73 View commit details
    Browse the repository at this point in the history

  4. ghc: Remove old cross work 

    That way the next commit can apply a similar diff to each GHC.
    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    bc16cfc View commit details
    Browse the repository at this point in the history

  5. ghc: Fix cross compilation to work with new system

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    1
    Copy the full SHA
    398ac54 View commit details
    Browse the repository at this point in the history

  6. ghc: Predicate libiconv on not using glibc instead of Darwin

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    e760de8 View commit details
    Browse the repository at this point in the history

  7. ghc: Fix env vars and configure flags to be weird 

    GHC currently handles this stuff in a quite non-standard way, basically
taking prog var `FOO` to mean `FOO_FROM_TARGET`. It's because it
(wrongly) thinks from stage 2's perspective.
    @Ericson2314
    Ryan Trinkle authored and Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    bd0de2f View commit details
    Browse the repository at this point in the history

  8. ghc 8.2.2 & head: Work around ARM bugs in BFD ld by using gold

    @bgamari @Ericson2314
    bgamari authored and Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    af03b77 View commit details
    Browse the repository at this point in the history

  9. ghc 8.0.2: Patch Cabal so --extra-*-dirs works right

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    60f45a2 View commit details
    Browse the repository at this point in the history

  10. ghc 8.2.2: Add bgamari's STRIP detection fix

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    23c29eb View commit details
    Browse the repository at this point in the history

  11. ghcHEAD: Bump version ghc-8.5.20180118

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    a2516ef View commit details
    Browse the repository at this point in the history

  12. ghc 8.4.1: Reformat to move rev into src

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    8560c02 View commit details
    Browse the repository at this point in the history

  13. haskell infra: nativeGhc != ghc.bootPkgs.ghc 

    There's no reason to wait for non-binary native to *build* cross ghc,
but we want a nix-built GHC for Setup.hs or things won't work.
    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    8155312 View commit details
    Browse the repository at this point in the history

  14. release-cross: Add a test for Haskell on Raspberry Pi and "Android" 

    Hello World with ghcHEAD. ghc822 to come after some patches.

Android will be turned into real Android...later.
    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    b612597 View commit details
    Browse the repository at this point in the history

  15. haskell lib: Make Cabal compiler names explicit 

    Cabal2nix expects a --compiler flag that contains a Cabal Compiler description.
We used to use the compiler's derivation name for this, but this breaks when
cross-compiling due to the target suffix. Instead we add an explicit
haskellCompilerName attribute to Haskell compiler derivations.
    @bgamari @Ericson2314
    bgamari authored and Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    bf68790 View commit details
    Browse the repository at this point in the history

  16. release-cross: Try building on Windows too

    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    13739e6 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #26799 from obsidiansystems/cross-haskell 

    haskell infra: Fix cross compilation to work with new system
    @Ericson2314
    Ericson2314 committed Jan 22, 2018
    Copy the full SHA
    ec0c480 View commit details
    Browse the repository at this point in the history