Merge pull request #133020 from NixOS/haskell-updates

haskellPackages: update hackage and stackage
This commit is contained in:
maralorn 2021-08-10 22:17:09 +02:00 committed by GitHub
commit c792caaf60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 611 additions and 89 deletions

View file

@ -1,6 +1,6 @@
{
"commit": "7818431b8d25dc7951cd7f50369741e9966d2dc8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7818431b8d25dc7951cd7f50369741e9966d2dc8.tar.gz",
"sha256": "1fssc5r0482i03rcyvagql06p41qmr8vnyw6501zhbprvz0y1sd4",
"msg": "Update from Hackage at 2021-08-04T07:53:53Z"
"commit": "8977803787241e1474bdbb35cbc704c57cce6fcd",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8977803787241e1474bdbb35cbc704c57cce6fcd.tar.gz",
"sha256": "1ivdqlmpdqpa5m5cdwdk6l258nmnz9a6466y8xs19x0wkdx4b738",
"msg": "Update from Hackage at 2021-08-07T10:52:35Z"
}

View file

@ -40,7 +40,7 @@
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "9.3.20210504"
, version ? "9.3.20210806"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -152,8 +152,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "049c3a83fbce67e58e70c727d89e8331608a4e04";
sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7";
rev = "5d651c78fed7e55b3b3cd21a04499d1a2f75204d";
sha256 = "1z9xg8jsqr9id985wxfhkjyb3kpyrmr7vjdqzfv42cpxynd483r8";
};
enableParallelBuilding = true;

View file

@ -1937,4 +1937,9 @@ EOT
sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1";
});
# Needs Cabal >= 3.4
chs-cabal = super.chs-cabal.override {
Cabal = self.Cabal_3_6_0_0;
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -713,6 +713,8 @@ broken-packages:
- combinatorial-problems
- combinator-interactive
- combobuffer
- comfort-array-shape
- comfort-fftw
- Command
- commander
- Commando
@ -2230,6 +2232,7 @@ broken-packages:
- hscd
- hs-cdb
- hscdio
- hscim
- hsclock
- hScraper
- hscuid
@ -4034,6 +4037,7 @@ broken-packages:
- robin
- robots-txt
- roc-cluster
- rocksdb-haskell
- roku-api
- rollbar
- rollbar-client

View file

@ -97,6 +97,7 @@ extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
- Cabal == 3.4.* # required for cabal-install etc.
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- dhall == 1.29.0 # required for ats-pkg
@ -236,6 +237,7 @@ package-maintainers:
- stm-containers
- streamly
- taskwarrior
- witch
pacien:
- ldgallery-compiler
peti:
@ -372,6 +374,7 @@ unsupported-platforms:
gtk-sni-tray: [ x86_64-darwin ]
haskell-snake: [ x86_64-darwin ]
hcwiid: [ x86_64-darwin ]
hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
HFuse: [ x86_64-darwin ]
hidapi: [ x86_64-darwin ]
hinotify-bytestring: [ x86_64-darwin ]

View file

@ -406,6 +406,7 @@ dont-distribute-packages:
- algebra-driven-design
- algebra-sql
- algolia
- align-audio
- alms
- alpha
- alsa-gui
@ -1539,6 +1540,7 @@ dont-distribute-packages:
- hmeap-utils
- hmep
- hmm-lapack
- hmm-lapack_0_4_1
- hmt
- hmt-diagrams
- hnormalise
@ -1888,6 +1890,8 @@ dont-distribute-packages:
- lapack
- lapack-carray
- lapack-comfort-array
- lapack-comfort-array_0_0_1
- lapack_0_4
- lat
- latex-formulae-hakyll
- latex-formulae-pandoc
@ -1932,6 +1936,7 @@ dont-distribute-packages:
- lighttpd-conf
- lighttpd-conf-qq
- linear-circuit
- linear-circuit_0_1_0_3
- linearmap-category
- linearscan-hoopl
- linkchk
@ -2010,6 +2015,7 @@ dont-distribute-packages:
- magic-wormhole
- magicbane
- magico
- magico_0_0_2_2
- mahoro
- maid
- mail-pool
@ -2560,6 +2566,7 @@ dont-distribute-packages:
- representable-tries
- req-oauth2
- resistor-cube
- resistor-cube_0_0_1_3
- resource-pool-catchio
- resource-simple
- respond
@ -3120,6 +3127,7 @@ dont-distribute-packages:
- venzone
- verdict-json
- versioning-servant
- vessel
- vflow-types
- vformat-aeson
- vformat-time

File diff suppressed because it is too large Load diff

View file

@ -300,7 +300,7 @@ let
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = all;
Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ];
cabal2nix-unstable = all;
funcmp = all;
# Doesn't currently work on ghc-9.0: