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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 289782b94bad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e755dc3fd733
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 11, 2017

  1. haskellPackages.mkDerivation: Use native jailbreak-cabal when cross-c… 

    …ompiling
    @shlevy
    shlevy committed Jan 11, 2017
    Copy the full SHA
    4687b61 View commit details

  2. haskellPackages.mkDerivation: Use native hsc2hs when cross-compiling

    @shlevy
    shlevy committed Jan 11, 2017
    Copy the full SHA
    6091811 View commit details

  3. Merge pull request #21811 from shlevy/ghc-cross-hsc2hs-jailbreak 

    GHC cross compilation native jailbreak and hsc2hs
    @peti
    peti authored Jan 11, 2017
    Copy the full SHA
    e755dc3 View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −1 pkgs/development/haskell-modules/default.nix
  2. +1 −0 pkgs/development/haskell-modules/generic-builder.nix
5 changes: 4 additions & 1 deletion pkgs/development/haskell-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,10 @@ let
mkDerivation = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
inherit (self) ghc jailbreak-cabal;
jailbreak-cabal = if (self.ghc.cross or null) != null
then self.ghc.bootPkgs.jailbreak-cabal
else self.jailbreak-cabal;
inherit (self) ghc;
hscolour = overrideCabal self.hscolour (drv: {
isLibrary = false;
doHaddock = false;
1 change: 1 addition & 0 deletions pkgs/development/haskell-modules/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ let
"--with-gcc=${ghc.cc}"
"--with-ld=${ghc.ld}"
"--hsc2hs-options=--cross-compile"
"--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
];

crossCabalFlagsString =