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: b285b85754b7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 175c3526aeae
Choose a head ref
  • 13 commits
  • 12 files changed
  • 2 contributors

Commits on Jul 26, 2017

  1. haskell-generic-builder: include setupHaskellDepends in the generated… 

    … "env" attribute

We achieve this by moving setupHaskellDepends from the buildInputs attribute
into "otherBuildInputs", which is the attribute the builder uses to construct
the build inputs in both the actual build as well as the "env" attribute.
    @peti
    peti committed Jul 26, 2017
    2 Configuration menu
    Copy the full SHA
    e69c7f5 View commit details
    Browse the repository at this point in the history

  2. haskell-generic-builder: fix syntax high-lightning in Emacs

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    27ca0cb View commit details
    Browse the repository at this point in the history

  3. haskell-diagrams-solve: disable failing test suite to fix the build

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    efa3ba8 View commit details
    Browse the repository at this point in the history

  4. ghc: apply a patch to fix common gold linker problem 

    It would otherwise result into undefined referenecs for some functions
in the base when using the gold linker:

   error: undefined reference to 'sqrt'

Fixes haskell/double-conversion#17

Previously ghc option -optl=-lm was used for packages depending on
such functions, but that could result into

   fatal error: cannot mix -r with dynamic object /nix/store/7crrmih8c52r8fbnqb933dxrsp44md93-glibc-2.25/lib/libm.so.6

in some situations like profiling builds.

Patch was prepared by Michael Bishop and Niklas Hambüchen.

Closes #27584.
    @domenkozar @peti
    domenkozar authored and peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    aafe3d2 View commit details
    Browse the repository at this point in the history

  5. hackage2nix: keep Cabal 1.24.x around for the time being

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    4664cf8 View commit details
    Browse the repository at this point in the history

  6. hackage2nix: drop old packages that were required for stack prior to … 

    …version 1.5.x
    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    8a3c080 View commit details
    Browse the repository at this point in the history

  7. hackage2nix: drop obsolete version of zlib

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    fd6f0a2 View commit details
    Browse the repository at this point in the history

  8. hackage2nix: disable failing builds

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    1178136 View commit details
    Browse the repository at this point in the history

  9. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.3.1-23-g656c589 from Hackage revision
commercialhaskell/all-cabal-hashes@2b4eeaa.
    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    91a8ed3 View commit details
    Browse the repository at this point in the history

  10. haskell: provide the name 'ghcjs-prim' (null) to fix evaluation errors

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    a911184 View commit details
    Browse the repository at this point in the history

  11. haskell: remove all code related to the "haste" compiler 

    These packages have been broken for a while and now they don't even evaluate
any more.
    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    28c0170 View commit details
    Browse the repository at this point in the history

  12. hedgewars: fix ambiguous use of the zlib variable

    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    9c64582 View commit details
    Browse the repository at this point in the history

  13. haskell: provide the name 'bin-package-db' (null) to fix evaluation e… 

    …rrors
    @peti
    peti committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    175c352 View commit details
    Browse the repository at this point in the history