Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

haskellPackages: update hackage and stackage #133020

Merged
merged 15 commits into from
Aug 10, 2021
Merged

haskellPackages: update hackage and stackage #133020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
981cf6a
all-cabal-hashes: 2021-08-04T07:53:53Z -> 2021-08-07T10:52:35Z
sternenseemann Aug 7, 2021
14467d1
haskellPackages: regenerate package set based on current config
sternenseemann Aug 7, 2021
124d658
haskellPackages.{cabal-install, cabal-install-parsers}: use Cabal 3.6…
sternenseemann Aug 7, 2021
74705f1
Merge remote-tracking branch 'origin/master' into haskell-updates
sternenseemann Aug 7, 2021
6c52cce
Merge master into haskell-updates
github-actions[bot] Aug 8, 2021
0085668
Merge master into haskell-updates
github-actions[bot] Aug 9, 2021
a794c51
haskell.compiler.ghcHEAD: 9.3.20210504 -> 9.3.20210806
utdemir Aug 9, 2021
912311c
Merge master into haskell-updates
github-actions[bot] Aug 10, 2021
debd994
Merge pull request #133309 from utdemir/ud/update-ghc-head-2021080
cdepillabout Aug 10, 2021
aeb4364
haskellPackages.witch: Add maralorn as maintainer
maralorn Aug 10, 2021
1445bec
haskellPackages.cabal-install: Switch Cabal back to 3.4 on older ghcs
maralorn Aug 10, 2021
50dc9c1
haskellPackages.chs-cabal: Fix build by overriding Cabal dep
maralorn Aug 10, 2021
1460077
haskellPackages: mark builds failing on hydra as broken
maralorn Aug 10, 2021
844bb64
haskellPackages.hevm: Fix eval by disabling on aarch64
maralorn Aug 10, 2021
d86710a
Merge branch 'master' into haskell-updates
maralorn Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions pkgs/development/compilers/ghc/head.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,8 @@ broken-packages:
- combinatorial-problems
- combinator-interactive
- combobuffer
- comfort-array-shape
- comfort-fftw
- Command
- commander
- Commando
Expand Down Expand Up @@ -2230,6 +2232,7 @@ broken-packages:
- hscd
- hs-cdb
- hscdio
- hscim
- hsclock
- hScraper
- hscuid
Expand Down Expand Up @@ -4034,6 +4037,7 @@ broken-packages:
- robin
- robots-txt
- roc-cluster
- rocksdb-haskell
- roku-api
- rollbar
- rollbar-client
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -236,6 +237,7 @@ package-maintainers:
- stm-containers
- streamly
- taskwarrior
- witch
pacien:
- ldgallery-compiler
peti:
Expand Down Expand Up @@ -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 ]
Expand Down
8 changes: 8 additions & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ dont-distribute-packages:
- algebra-driven-design
- algebra-sql
- algolia
- align-audio
- alms
- alpha
- alsa-gui
Expand Down Expand Up @@ -1539,6 +1540,7 @@ dont-distribute-packages:
- hmeap-utils
- hmep
- hmm-lapack
- hmm-lapack_0_4_1
- hmt
- hmt-diagrams
- hnormalise
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2010,6 +2015,7 @@ dont-distribute-packages:
- magic-wormhole
- magicbane
- magico
- magico_0_0_2_2
- mahoro
- maid
- mail-pool
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -3120,6 +3127,7 @@ dont-distribute-packages:
- venzone
- verdict-json
- versioning-servant
- vessel
- vflow-types
- vformat-aeson
- vformat-time
Expand Down
Loading