pyrox.dev / nixpkgs
lol
fork atom

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

haskell.compiler.ghc*Binary: make sure meta can always be evaluated

authored by Francesco Gazzetta and committed by GitHub 17544589 2e987451

+12 -3
unified split
+4 -1
pkgs/development/compilers/ghc/8.10.2-binary.nix
··· 421 421 422 422 # Our Cabal compiler name 423 423 haskellCompilerName = "ghc-${version}"; 424 - } // lib.optionalAttrs (binDistUsed.isHadrian or false) { 424 + } 425 + # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, 426 + # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. 427 + // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { 425 428 # Normal GHC derivations expose the hadrian derivation used to build them 426 429 # here. In the case of bindists we just make sure that the attribute exists, 427 430 # as it is used for checking if a GHC derivation has been built with hadrian.
+4 -1
pkgs/development/compilers/ghc/8.10.7-binary.nix
··· 417 417 418 418 # Our Cabal compiler name 419 419 haskellCompilerName = "ghc-${version}"; 420 - } // lib.optionalAttrs (binDistUsed.isHadrian or false) { 420 + } 421 + # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, 422 + # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. 423 + // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { 421 424 # Normal GHC derivations expose the hadrian derivation used to build them 422 425 # here. In the case of bindists we just make sure that the attribute exists, 423 426 # as it is used for checking if a GHC derivation has been built with hadrian.
+4 -1
pkgs/development/compilers/ghc/9.2.4-binary.nix
··· 403 403 404 404 # Our Cabal compiler name 405 405 haskellCompilerName = "ghc-${version}"; 406 - } // lib.optionalAttrs (binDistUsed.isHadrian or false) { 406 + } 407 + # We duplicate binDistUsed here since we have a sensible default even if no bindist is avaible, 408 + # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms. 409 + // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) { 407 410 # Normal GHC derivations expose the hadrian derivation used to build them 408 411 # here. In the case of bindists we just make sure that the attribute exists, 409 412 # as it is used for checking if a GHC derivation has been built with hadrian.