···11{
22- "commit": "78541d36393ac3dd0ffa32b4a9af15fecdefb5d1",
33- "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78541d36393ac3dd0ffa32b4a9af15fecdefb5d1.tar.gz",
44- "sha256": "1qwjkjlz9sw1jnsarin6803vj68bfm3iyysfwxaifga5w4dsrqcs",
55- "msg": "Update from Hackage at 2022-12-30T22:03:31Z"
22+ "commit": "9f677e1d2267621375d22e3f6c1a25246678be4c",
33+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f677e1d2267621375d22e3f6c1a25246678be4c.tar.gz",
44+ "sha256": "0y2mbj8dwfgdz5pzdq682clab10xgnqlrfv1najx53yy5jf63pcv",
55+ "msg": "Update from Hackage at 2023-01-06T18:29:38Z"
66}
+2
pkgs/development/compilers/ghc/common-hadrian.nix
···353353 '';
354354355355 ${if targetPlatform.isGhcjs then "configureScript" else null} = "emconfigure ./configure";
356356+ # GHC currently ships an edited config.sub so ghcjs is accepted which we can not rollback
357357+ ${if targetPlatform.isGhcjs then "dontUpdateAutotoolsGnuConfigScripts" else null} = true;
356358357359 # TODO(@Ericson2314): Always pass "--target" and always prefix.
358360 configurePlatforms = [ "build" "host" ]
···6666 # > https://github.com/roelvandijk/numerals
6767 numerals = doJailbreak (dontCheck super.numerals);
68686969- # Too stricut upper bound on time
7070- # https://github.com/acw/rate-limit/issues/9
7171- rate-limit = doJailbreak super.rate-limit;
7272-7369 # This test keeps being aborted because it runs too quietly for too long
7470 Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
7571···478474 # https://github.com/kkardzis/curlhs/issues/6
479475 curlhs = dontCheck super.curlhs;
480476481481- # Too strict upper bounds on bytestring & time
482482- # https://github.com/barrucadu/irc-conduit/issues/35
483483- irc-conduit = doJailbreak super.irc-conduit;
484484- # https://github.com/barrucadu/irc-client/issues/77
485485- irc-client = doJailbreak super.irc-client;
486486-487477 # https://github.com/hvr/token-bucket/issues/3
488478 token-bucket = dontCheck super.token-bucket;
489479···654644 }) newer;
655645656646 # * The standard libraries are compiled separately.
657657- # * We need multiple patches from master to fix compilation with
647647+ # * We need a patch from master to fix compilation with
658648 # updated dependencies (haskeline and megaparsec) which can be
659659- # removed when the next idris release (1.3.4 probably) comes
660660- # around.
649649+ # removed when the next idris release comes around.
661650 idris = self.generateOptparseApplicativeCompletions [ "idris" ]
662662- (doJailbreak (dontCheck super.idris));
651651+ (appendPatch (fetchpatch {
652652+ name = "idris-libffi-0.2.patch";
653653+ url = "https://github.com/idris-lang/Idris-dev/commit/6d6017f906c5aa95594dba0fd75e7a512f87883a.patch";
654654+ hash = "sha256-wyLjqCyLh5quHMOwLM5/XjlhylVC7UuahAM79D8+uls=";
655655+ }) (doJailbreak (dontCheck super.idris)));
663656664657 # Too strict bound on hspec
665658 # https://github.com/lspitzner/multistate/issues/9#issuecomment-1367853016
···13571350 haskell-language-server = (lib.pipe super.haskell-language-server [
13581351 dontCheck
13591352 (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways …
13601360- (assert super.hls-call-hierarchy-plugin.version == "1.1.0.0"; disableCabalFlag "callHierarchy") # Disabled temporarily: https://github.com/haskell/haskell-language-server/pull/3431
13611353 ]).overrideScope (lself: lsuper: {
13621362- hls-call-hierarchy-plugin = null;
13631354 # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
13641355 # because some packages, like ormolu, need a newer Cabal version.
13651356 # ghc-paths is special because it depends on Cabal for building
···19771968 "--skip" "/toJsonSerializer/should generate valid JSON/"
19781969 ] ++ drv.testFlags or [];
19791970 }) super.hschema-aeson;
19801980- # https://github.com/ssadler/aeson-quick/issues/3
19811981- aeson-quick = overrideCabal (drv: {
19821982- testFlags = [
19831983- "-p" "!/asLens.set/&&!/complex.set/&&!/multipleKeys.set/"
19841984- ] ++ drv.testFlags or [];
19851985- }) super.aeson-quick;
19861971 # https://github.com/minio/minio-hs/issues/165
19871972 minio-hs = overrideCabal (drv: {
19881973 testFlags = [
···21102095 # https://github.com/zellige/hs-geojson/issues/29
21112096 geojson = dontCheck super.geojson;
2112209721132113- # Support network >= 3.1.2
21142114- # https://github.com/erebe/wstunnel/pull/107
21152115- wstunnel = appendPatch (fetchpatch {
21162116- url = "https://github.com/erebe/wstunnel/pull/107/commits/47c1f62bdec1dbe77088d9e3ceb6d872f922ce34.patch";
21172117- sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0=";
21182118- }) super.wstunnel;
20982098+ # Test suite doesn't compile
20992099+ # https://github.com/erebe/wstunnel/issues/145
21002100+ wstunnel = dontCheck super.wstunnel;
2119210121202102 # Test data missing from sdist
21212103 # https://github.com/ngless-toolkit/ngless/issues/152
···1111in
12121313{ pname
1414-, dontStrip ? (ghc.isGhcjs or false)
1414+# Note that ghc.isGhcjs != stdenv.hostPlatform.isGhcjs.
1515+# ghc.isGhcjs implies that we are using ghcjs, a project separate from GHC.
1616+# (mere) stdenv.hostPlatform.isGhcjs means that we are using GHC's JavaScript
1717+# backend. The latter is a normal cross compilation backend and needs little
1818+# special accomodation.
1919+, dontStrip ? (ghc.isGhcjs or false || stdenv.hostPlatform.isGhcjs)
1520, version, revision ? null
1621, sha256 ? null
1722, src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
···171176 # Pass the "wrong" C compiler rather than none at all so packages that just
172177 # use the C preproccessor still work, see
173178 # https://github.com/haskell/cabal/issues/6466 for details.
174174- "--with-gcc=${(if stdenv.hasCC then stdenv else buildPackages.stdenv).cc.targetPrefix}cc"
179179+ "--with-gcc=${if stdenv.hasCC then "$CC" else "$CC_FOR_BUILD"}"
175180 ] ++ optionals stdenv.hasCC [
176181 "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
177182 "--with-ar=${stdenv.cc.bintools.targetPrefix}ar"
···246251 allPkgconfigDepends = pkg-configDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
247252 optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
248253249249- depsBuildBuild = [ nativeGhc ];
254254+ depsBuildBuild = [ nativeGhc ]
255255+ # CC_FOR_BUILD may be necessary if we have no C preprocessor for the host
256256+ # platform. See crossCabalFlags above for more details.
257257+ ++ lib.optionals (!stdenv.hasCC) [ buildPackages.stdenv.cc ];
250258 collectedToolDepends =
251259 buildTools ++ libraryToolDepends ++ executableToolDepends ++
252260 optionals doCheck testToolDepends ++
···316324 inherit src;
317325318326 inherit depsBuildBuild nativeBuildInputs;
319319- buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs;
327327+ buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs
328328+ # For patchShebangsAuto in fixupPhase
329329+ ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ];
320330 propagatedBuildInputs = optionals isLibrary propagatedBuildInputs;
321331322332 LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase.
···1455814558 haskell = callPackage ./haskell-packages.nix { };
14559145591456014560 haskellPackages = dontRecurseIntoAttrs
1456114561- # Prefer native-bignum to avoid linking issues with gmp
1456214562- (if stdenv.hostPlatform.isStatic
1456314563- then haskell.packages.native-bignum.ghc92
1456414564- else haskell.packages.ghc92);
1456114561+ # JS backend is only available for GHC >= 9.6
1456214562+ (if stdenv.hostPlatform.isGhcjs
1456314563+ then haskell.packages.native-bignum.ghcHEAD
1456414564+ # Prefer native-bignum to avoid linking issues with gmp
1456514565+ else if stdenv.hostPlatform.isStatic
1456614566+ then haskell.packages.native-bignum.ghc92
1456714567+ else haskell.packages.ghc92);
14565145681456614569 # haskellPackages.ghc is build->host (it exposes the compiler used to build the
1456714570 # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more