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: a0c480ab1ff6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ce0180dfd56c
Choose a head ref
  • 13 commits
  • 8 files changed
  • 3 contributors

Commits on May 23, 2018

  1. haskell-generic-builder: Add extra framework dirs

    Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
    this, but we need to make Cabal aware so that the haskell builds have
    the correct metadata.
    Ericson2314 committed May 23, 2018
    Configuration menu
    Copy the full SHA
    513cd3d View commit details
    Browse the repository at this point in the history
  2. haskell generic builder: setupHaskellDepends should be `nativeBuild…

    …Inputs
    
    This is because they are just for Setup.hs, so they are just used at build time
    and completely isolated from the normal components' dependencies.
    
    This was previous implemented in 8a8f040, but
    reverted in e69c7f5 because it broken
    setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
    shell environments has never worked). This version adds a special native
    exception to avoid that breakage.
    Ericson2314 committed May 23, 2018
    Configuration menu
    Copy the full SHA
    e1b9419 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    38fbdcc View commit details
    Browse the repository at this point in the history
  4. haskell generic builder: Disable static libs on Windows because no -s…

    …taticlib
    
    The reason why this does not work is not that we can't built static
    objects, we can, but we can't use `-staticlib` on GHC on windows.
    `-staticlib` rolls all dependencies into a combined archive. While this
    would work on windows if we used gnu ar and MRI script, GHC can't rely
    on GNU ar, and as such has a quick archive concatenation module for GNU
    and BSD archives only.
    angerman authored and Ericson2314 committed May 23, 2018
    Configuration menu
    Copy the full SHA
    a4d5dbd View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    affeb0c View commit details
    Browse the repository at this point in the history
  6. haskell infra: Adds buildFlags logic

    angerman authored and Ericson2314 committed May 23, 2018
    Configuration menu
    Copy the full SHA
    87afa66 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    63e5b3c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9ce15ea View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1978115 View commit details
    Browse the repository at this point in the history
  10. ghc: paxmark all unwraped executables across the board

    Shell glob works even as the exact set of executable (filenames) varries
    beween configuations. Need to skip non ELFs (e.g. shell scripts),
    however.
    angerman authored and Ericson2314 committed May 23, 2018
    Configuration menu
    Copy the full SHA
    10b76a4 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    c7458de View commit details
    Browse the repository at this point in the history
  12. ghc 8.4.2, head: Drop libiconv on windows.

    nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
    angerman authored and Ericson2314 committed May 23, 2018
    1 Configuration menu
    Copy the full SHA
    fe1eec9 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. Merge pull request #40996 from obsidiansystems/cross-ghc

    ghc, haskell-infra: #40929 take 2
    Ericson2314 committed May 25, 2018
    Configuration menu
    Copy the full SHA
    ce0180d View commit details
    Browse the repository at this point in the history