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: 26a46295eb4e^
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 398061dfc593
Choose a head ref
  • 5 commits
  • 7 files changed
  • 2 contributors

Commits on Dec 25, 2017

  1. ghc prebuilt: Clean up derivations ever so slightly

    These changes do break hashes, but are good to have everywhere for
    consistency. Plus, changing the bootstrap causes a Haskell mass rebuild
    anyways.
    Ericson2314 authored and domenkozar committed Dec 25, 2017
    Copy the full SHA
    26a4629 View commit details
    Browse the repository at this point in the history
  2. ghc binary: Fix interpreter than patch RPATH

    The newer to-be-added binaries have relative RPATHs that we'll break if
    we try to `patchelf` before installation. We instead us LD_LOAD_LIBRARY
    during the installation, which avoids needing to change the RPATH
    temporarily.
    Ericson2314 authored and domenkozar committed Dec 25, 2017
    Copy the full SHA
    150255e View commit details
    Browse the repository at this point in the history
  3. ghc prebuilt: Simplify and harden Darwin fixup

     - Patch all executables and libraries, while skipping scripts. Base at
       least uses libiconv, so should need this too---I suspect it wasn't a
       problem before as we got away with the immpurity.
    
     - Rather than hardcoding the symlinks to add, do one per mach-o as
       needed
    
    TEMP no -L no script
    Ericson2314 authored and domenkozar committed Dec 25, 2017
    Copy the full SHA
    b6867f7 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    ed93d2d View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    398061d View commit details
    Browse the repository at this point in the history