Domen Kožar
GitHub
commit
cb4332e3eb
8 changed files with 2415 additions and 612 deletions
|
|
@ -104,5 +104,4 @@ in stdenv.mkDerivation {
|
|||
|
||||
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
|
||||
meta.maintainers = [lib.maintainers.elvishjerricco];
|
||||
meta.hydraPlatforms = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1035,6 +1035,8 @@ self: super: {
|
|||
generateOptparseApplicativeCompletion "dhall" (
|
||||
dontCheck super.dhall
|
||||
);
|
||||
dhall_1_26_1 = dontCheck super.dhall_1_26_1;
|
||||
|
||||
|
||||
# Missing test files in source distribution, fixed once 1.4.0 is bumped
|
||||
# https://github.com/dhall-lang/dhall-haskell/pull/997
|
||||
|
|
@ -1054,12 +1056,13 @@ self: super: {
|
|||
# https://github.com/haskell-hvr/hgettext/issues/14
|
||||
hgettext = doJailbreak super.hgettext;
|
||||
|
||||
# 2.23.0 supports GHC 8.x and up
|
||||
haddock = super.haddock_2_22_0;
|
||||
# haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6”
|
||||
haddock-api = dontHaddock (doJailbreak (super.haddock-api));
|
||||
haddock-api = dontHaddock (doJailbreak (super.haddock-api_2_22_0));
|
||||
|
||||
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
|
||||
haddock-library = doJailbreak (dontCheck super.haddock-library);
|
||||
# haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
|
||||
|
||||
# Generate shell completion.
|
||||
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
|
||||
|
|
@ -1191,8 +1194,8 @@ self: super: {
|
|||
temporary-resourcet = doJailbreak super.temporary-resourcet;
|
||||
|
||||
# Requires dhall >= 1.23.0
|
||||
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
|
||||
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };
|
||||
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_1; };
|
||||
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_1; };
|
||||
|
||||
# Test suite doesn't work with current QuickCheck
|
||||
# https://github.com/pruvisto/heap/issues/11
|
||||
|
|
@ -1202,7 +1205,7 @@ self: super: {
|
|||
constraints-deriving = dontCheck super.constraints-deriving;
|
||||
|
||||
# need newer version of ghc-libparser
|
||||
hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_0_20190723; };
|
||||
hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; };
|
||||
|
||||
# https://github.com/sol/hpack/issues/366
|
||||
hpack = self.hpack_0_32_0;
|
||||
|
|
@ -1225,10 +1228,4 @@ self: super: {
|
|||
# The LTS-14.x version of optparse-applicative is too old.
|
||||
cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
|
||||
|
||||
# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
|
||||
amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch;
|
||||
|
||||
# https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b
|
||||
amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
|||
|
|
@ -74,7 +74,11 @@ self: super: {
|
|||
# Newer versions don't compile.
|
||||
resolv = self.resolv_0_1_1_2;
|
||||
|
||||
# cabal2nix needs the latest version of Cabal.
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
|
||||
# cabal2nix needs the latest version of Cabal, and the one
|
||||
# hackage-db uses must match, so take the latest
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_0_0_0;
|
||||
hackage-db = self.hackage-db_2_1_0;
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,9 +84,11 @@ self: super: {
|
|||
})) (drv: {
|
||||
preConfigure = "sed -i -e 's/base >=4 && < 4.13,/base,/' regex-base.cabal";
|
||||
});
|
||||
regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch {
|
||||
regex-posix = overrideCabal (appendPatch super.regex-posix (pkgs.fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
|
||||
sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
|
||||
})) (drv: {
|
||||
preConfigure = "sed -i -e 's/base >= 4 && < 4.13/base/' regex-posix.cabal";
|
||||
});
|
||||
optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
|
||||
|
|
|
|||
|
|
@ -2485,15 +2485,9 @@ extra-packages:
|
|||
- dbus <1 # for xmonad-0.26
|
||||
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
|
||||
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
|
||||
- ghc-lib-parser == 8.8.0.20190723 # required by hlint-2.2.2
|
||||
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
|
||||
- haddock < 2.17 # required on GHC 7.10.x
|
||||
- haddock == 2.17.* # required on GHC 8.0.x
|
||||
- haddock-api == 2.15.* # required on GHC 7.8.x
|
||||
- haddock-api == 2.16.* # required on GHC 7.10.x
|
||||
- haddock-api == 2.17.* # required on GHC 8.0.x
|
||||
- haddock-library == 1.2.* # required for haddock-api-2.16.x
|
||||
- haddock-library == 1.4.3 # required for haddock-api-2.17.x
|
||||
- haddock == 2.22.* # required on GHC 8.0.x
|
||||
- haddock-api == 2.22.* # required on GHC 7.8.x
|
||||
- happy <1.19.6 # newer versions break Agda
|
||||
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
|
||||
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
|
||||
|
|
@ -3129,6 +3123,7 @@ broken-packages:
|
|||
- base-feature-macros
|
||||
- base-generics
|
||||
- base-io-access
|
||||
- base62
|
||||
- base64-conduit
|
||||
- baserock-schema
|
||||
- BASIC
|
||||
|
|
@ -3704,6 +3699,7 @@ broken-packages:
|
|||
- codex
|
||||
- coin
|
||||
- coinbase-exchange
|
||||
- coinbase-pro
|
||||
- coincident-root-loci
|
||||
- colada
|
||||
- colchis
|
||||
|
|
@ -6475,6 +6471,7 @@ broken-packages:
|
|||
- json-python
|
||||
- json-schema
|
||||
- json-togo
|
||||
- json-tokens
|
||||
- json-tools
|
||||
- json-tracer
|
||||
- json2
|
||||
|
|
@ -7393,6 +7390,7 @@ broken-packages:
|
|||
- net-spider-cli
|
||||
- net-spider-pangraph
|
||||
- net-spider-rpl
|
||||
- net-spider-rpl-cli
|
||||
- netclock
|
||||
- netcore
|
||||
- netease-fm
|
||||
|
|
@ -7461,7 +7459,6 @@ broken-packages:
|
|||
- Ninjas
|
||||
- nirum
|
||||
- nitro
|
||||
- niv
|
||||
- nixfromnpm
|
||||
- nkjp
|
||||
- nlp-scores
|
||||
|
|
@ -7931,6 +7928,7 @@ broken-packages:
|
|||
- porte
|
||||
- PortFusion
|
||||
- ports
|
||||
- poseidon-postgis
|
||||
- posix-acl
|
||||
- posix-api
|
||||
- posix-realtime
|
||||
|
|
@ -8555,6 +8553,7 @@ broken-packages:
|
|||
- scholdoc-types
|
||||
- scidb-hquery
|
||||
- science-constants-dimensional
|
||||
- scientific-notation
|
||||
- SciFlow
|
||||
- SciFlow-drmaa
|
||||
- scion
|
||||
|
|
|
|||
|
|
@ -94,11 +94,9 @@ self: super: builtins.intersectAttrs super {
|
|||
# Won't find it's header files without help.
|
||||
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
|
||||
|
||||
cachix = overrideCabal (addBuildTools (enableSeparateBinOutput super.cachix) [pkgs.boost]) (drv: {
|
||||
postPatch = (drv.postPatch or "") + ''
|
||||
substituteInPlace cachix.cabal --replace "c++14" "c++17"
|
||||
'';
|
||||
});
|
||||
cachix = enableSeparateBinOutput super.cachix;
|
||||
|
||||
niv = enableSeparateBinOutput super.niv;
|
||||
|
||||
ghcid = enableSeparateBinOutput super.ghcid;
|
||||
|
||||
|
|
@ -589,7 +587,6 @@ self: super: builtins.intersectAttrs super {
|
|||
snap-server = dontCheck super.snap-server;
|
||||
|
||||
# Tests require internet
|
||||
dhall_1_26_0 = dontCheck super.dhall_1_26_0;
|
||||
http-download = dontCheck super.http-download;
|
||||
pantry = dontCheck super.pantry;
|
||||
|
||||
|
|
|
|||
2965
pkgs/development/haskell-modules/hackage-packages.nix
generated
2965
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -10462,7 +10462,9 @@ in
|
|||
|
||||
c-blosc = callPackage ../development/libraries/c-blosc { };
|
||||
|
||||
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
|
||||
cachix = haskellPackages.cachix.bin;
|
||||
|
||||
niv = haskellPackages.niv.bin;
|
||||
|
||||
capnproto = callPackage ../development/libraries/capnproto { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue