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: 5b6ad6445643
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81ef8bc42ae8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 15, 2019

  1. haskellSrc2nix 

    Since [1], cabal2nix has been able to parse full platform triples. We
need this for when the system doesn't say enough info (e.g. android).

[1]: NixOS/cabal2nix@0bb88f0#diff-d9172aeec4039eef8cfcc8a2ab6c0677R143

(cherry picked from commit 66a9f39)
    @Ericson2314
    Ericson2314 committed Oct 15, 2019
    Copy the full SHA
    81ef8bc View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/haskell-modules/make-package-set.nix
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/make-package-set.nix
View file
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ let
installPhase = ''
export HOME="$TMP"
mkdir -p "$out"
cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
'';
};