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: f2fd4a5219fc
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: eb6db32d0153
Choose a head ref
  • 7 commits
  • 21 files changed
  • 3 contributors

Commits on Jan 3, 2018

  1. Merge commit 'db475df127f8c82853181c46501c142ff020c3d8' into ericson2… 

    …314-cross-base
    @Ericson2314
    Ericson2314 committed Jan 3, 2018
    Copy the full SHA
    e399346 View commit details
    Browse the repository at this point in the history

  2. ghc: Clean up, and add passthru.targetPrefix, in preparation for cross 

    No hashes should be changed.
    @Ericson2314
    Ericson2314 committed Jan 3, 2018
    Copy the full SHA
    a5cc983 View commit details
    Browse the repository at this point in the history

  3. haskell infra: Fix cross as much as possible without changing hashes

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

  4. ghc 8.2.2, head: Inline common* bindings 

    Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
    @Ericson2314
    Ericson2314 committed Jan 3, 2018
    Copy the full SHA
    faa4b45 View commit details
    Browse the repository at this point in the history

  5. haskell generic-builder: Don't use absolute path to tools, and also t… 

    …rack strip
    @Ericson2314
    Ericson2314 committed Jan 3, 2018
    Copy the full SHA
    bc06646 View commit details
    Browse the repository at this point in the history

  6. ghcWithPackages: Fix cross, and avoid needless C compiler

    @Ericson2314
    Ericson2314 committed Jan 3, 2018
    2
    Copy the full SHA
    5e31e82 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #33358 from obsidiansystems/cross-haskell-samehash 

    haskell infra, ghc: Start to fix cross compilation without changing hashes
    @peti
    peti committed Jan 3, 2018
    Copy the full SHA
    eb6db32 View commit details
    Browse the repository at this point in the history