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

Commits on May 21, 2018

  1. 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
    Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    900862e View commit details
    Browse the repository at this point in the history

  2. haskell generic builder: Use setup package database for setup-depends 

    Adapted from obsidiansystems@b69f420 by @Ericson2314
    @angerman @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    15759df View commit details
    Browse the repository at this point in the history

  3. 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 @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    4ea33de View commit details
    Browse the repository at this point in the history

  4. haskell generic builder: Do the links dance only if shared is enabled.

    @angerman @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    5e589a4 View commit details
    Browse the repository at this point in the history

  5. haskell infra: Adds buildFlags logic

    @angerman @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    82a847a View commit details
    Browse the repository at this point in the history

  6. used stdenv.targetPlatform.isDarwin and not stdenv.isDarwin.

    @angerman @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    f914fdd View commit details
    Browse the repository at this point in the history

  7. ghc: Normalize derivations

    @Ericson2314
    Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    6f2f081 View commit details
    Browse the repository at this point in the history

  8. ghc: Handle flavors better

    @Ericson2314
    Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    8d2ce11 View commit details
    Browse the repository at this point in the history

  9. ghc: paxmark all unwraped executables across the board 

    Shell glob works even as the exact set of executable (filenames) varries
beween configuations.
    @angerman @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    6af0c19 View commit details
    Browse the repository at this point in the history

  10. ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows

    @Ericson2314
    Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    03602f8 View commit details
    Browse the repository at this point in the history

  11. 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 @Ericson2314
    angerman authored and Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    4b48094 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'staging' into feature/clean-ghc

    @Ericson2314
    Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    d6ecbbe View commit details
    Browse the repository at this point in the history

  13. Merge pull request #40642 from angerman/feature/clean-ghc 

    ghc, haskell-infra: Improve cross-compilation
    @Ericson2314
    Ericson2314 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    ae62436 View commit details
    Browse the repository at this point in the history