Unverified Commit 8df4b1ad authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #208421 from NixOS/haskell-updates 

haskellPackages: update stackage and hackage
parents 05968fc7 3b1869aa

pkgs/data/misc/hackage/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "commit": "208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/208dc93f04d6fb2dbc01e11434c7dcea50a8a9e6.tar.gz",

  "sha256": "19pgh69fj3p1glqyjikpsvn5j4bax6yw5qxf9qaaap19hksgn85p",

  "msg": "Update from Hackage at 2022-12-28T16:35:05Z"

  "commit": "78541d36393ac3dd0ffa32b4a9af15fecdefb5d1",

  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78541d36393ac3dd0ffa32b4a9af15fecdefb5d1.tar.gz",

  "sha256": "1qwjkjlz9sw1jnsarin6803vj68bfm3iyysfwxaifga5w4dsrqcs",

  "msg": "Update from Hackage at 2022-12-30T22:03:31Z"

}

pkgs/development/compilers/emscripten/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, llvmPackages

, symlinkJoin, makeWrapper, substituteAll

, mkYarnModules

, emscripten

}:



stdenv.mkDerivation rec {
@@ -116,6 +117,13 @@ stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  passthru = {

    # HACK: Make emscripten look more like a cc-wrapper to GHC

    # when building the javascript backend.

    targetPrefix = "em";

    bintools = emscripten;

  };



  meta = with lib; {

    homepage = "https://github.com/emscripten-core/emscripten";

    description = "An LLVM-to-JavaScript Compiler";

pkgs/development/compilers/ghc/8.10.7.nix

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 


, # If enabled, GHC will be built with the GPL-free but slower integer-simple

  # library instead of the faster but GPLed integer-gmp library.

  enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp

  enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp

                          && lib.meta.availableOn stdenv.targetPlatform gmp)

, gmp



, # If enabled, use -fPIC when compiling static libs.

  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform

pkgs/development/compilers/ghc/8.8.4.nix

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 


, # If enabled, GHC will be built with the GPL-free but slower integer-simple

  # library instead of the faster but GPLed integer-gmp library.

  enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp

  enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp

                          && lib.meta.availableOn stdenv.targetPlatform gmp)

, gmp



, # If enabled, use -fPIC when compiling static libs.

  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform

pkgs/development/compilers/ghc/9.0.2.nix

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 


, # If enabled, GHC will be built with the GPL-free but slightly slower native

  # bignum backend instead of the faster but GPLed gmp backend.

  enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp)

  enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp

                         && lib.meta.availableOn stdenv.targetPlatform gmp)

, gmp



, # If enabled, use -fPIC when compiling static libs.