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: 136152af802a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e239c8b34009
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 28, 2020

  1. ghc865-binary: Use binary distribution which links against ncurses6 for 

    x86_64-linux

Ben Gamari's patch from #85924.

Fixes #85924, allowing one to bootstrap GHC in `pkgsMusl`

`nix-build -A pkgsMusl.haskellPackages.hello` succeeds with this patch.
    @expipiplus1
    expipiplus1 committed Nov 28, 2020
    Copy the full SHA
    15b3bc3 View commit details
    Browse the repository at this point in the history

  2. binutils: patch to fix https://sourceware.org/bugzilla/show_bug.cgi?i… 

    …d=16177

This bug was preventing one compiling Haskell programs from `pkgsMusl` for
armv7.

`nix-build --argstr crossSystem "armv7l-linux" -A pkgsMusl.haskellPackages.hello`
succeeds with this patch.

The patch is Nick Clifton's one, rebased by @Ericson2314 here
https://sourceware.org/bugzilla/show_bug.cgi?id=16177#c6

Although there was some talk about the efficacy of the binutils patch
(https://sourceware.org/bugzilla/show_bug.cgi?id=16177#c9) the resulting
binary seems to run without issue on the target platform. Jessica's
patch there caused ld to fail linking some programs. Nick's proposed
patch has worked well in my testing so far (a Haskell project of some
small complexity cross compiled with musl to armv7).
    @expipiplus1
    expipiplus1 committed Nov 28, 2020
    Copy the full SHA
    b3640e0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #103183 from expipiplus1/joe-haskell-cross-2 

    Fix GHC bootstrap in pkgsMusl and include patch for binutils/16177
    @FRidh
    FRidh committed Nov 28, 2020
    Copy the full SHA
    e239c8b View commit details
    Browse the repository at this point in the history