Unverified Commit 17544589 authored by Francesco Gazzetta's avatar Francesco Gazzetta Committed by GitHub
Browse files

Merge pull request #246805 from sternenseemann/ghc-binary-meta-evaluable 

haskell.compiler.ghc*Binary: make sure meta can always be evaluated
parents 2e987451 bf388d55

pkgs/development/compilers/ghc/8.10.2-binary.nix

+4 −1
Original line number Diff line number Diff line
@@ -421,7 +421,10 @@ stdenv.mkDerivation rec { 


    # Our Cabal compiler name

    haskellCompilerName = "ghc-${version}";

  } // lib.optionalAttrs (binDistUsed.isHadrian or false) {

  }

  # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible,

  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.

  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {

    # Normal GHC derivations expose the hadrian derivation used to build them

    # here. In the case of bindists we just make sure that the attribute exists,

    # as it is used for checking if a GHC derivation has been built with hadrian.

pkgs/development/compilers/ghc/8.10.7-binary.nix

+4 −1
Original line number Diff line number Diff line
@@ -417,7 +417,10 @@ stdenv.mkDerivation rec { 


    # Our Cabal compiler name

    haskellCompilerName = "ghc-${version}";

  } // lib.optionalAttrs (binDistUsed.isHadrian or false) {

  }

  # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible,

  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.

  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {

    # Normal GHC derivations expose the hadrian derivation used to build them

    # here. In the case of bindists we just make sure that the attribute exists,

    # as it is used for checking if a GHC derivation has been built with hadrian.

pkgs/development/compilers/ghc/9.2.4-binary.nix

+4 −1
Original line number Diff line number Diff line
@@ -403,7 +403,10 @@ stdenv.mkDerivation rec { 


    # Our Cabal compiler name

    haskellCompilerName = "ghc-${version}";

  } // lib.optionalAttrs (binDistUsed.isHadrian or false) {

  }

  # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible,

  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.

  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {

    # Normal GHC derivations expose the hadrian derivation used to build them

    # here. In the case of bindists we just make sure that the attribute exists,

    # as it is used for checking if a GHC derivation has been built with hadrian.