public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122510 from NixOS/haskell-updates

This commit is contained in:
maralorn 2021-05-12 00:01:25 +02:00 committed by GitHub
parent be038cf4f9 ac667f26c1
commit 00794f2270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 704 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maintainers/scripts/haskell/hydra-report.hs
View File

@ -155,7 +155,7 @@ getMaintainerMap = do
get c p i e = readProcess c p i <&> \x -> either (error . (<> " Raw:'" <> take 1000 x <> "'") . (e <>)) Prelude.id . eitherDecodeStrict' . encodeUtf8 . Text.pack $ x
-- BuildStates are sorted by subjective importance/concerningness
data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | Unfinished | Success deriving (Show, Eq, Ord)
data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | HydraFailure | Unfinished | Success deriving (Show, Eq, Ord)
icon :: BuildState -> Text
icon = \case
@ -166,6 +166,7 @@ icon = \case
TimedOut -> ":hourglass::no_entry_sign:"
Canceled -> ":no_entry_sign:"
Unfinished -> ":hourglass_flowing_sand:"
HydraFailure -> ":construction:"
Success -> ":heavy_check_mark:"
platformIcon :: Platform -> Text
@ -199,10 +200,11 @@ buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap
state = case (finished, buildstatus) of
(0, _) -> Unfinished
(_, Just 0) -> Success
(_, Just 1) -> Failed
(_, Just 2) -> DependencyFailed
(_, Just 3) -> HydraFailure
(_, Just 4) -> Canceled
(_, Just 7) -> TimedOut
(_, Just 2) -> DependencyFailed
(_, Just 1) -> Failed
(_, Just 11) -> OutputLimitExceeded
(_, i) -> Unknown i
packageName = fromMaybe job (Text.stripSuffix ("." <> system) job)

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"commit": "3d54acea35f6f709fa96c87696b845b3044dcab5",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz",
"sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g",
"msg": "Update from Hackage at 2021-05-07T19:29:19Z"
"commit": "b963dde27c24394c4be0031039dae4cb6a363aed",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b963dde27c24394c4be0031039dae4cb6a363aed.tar.gz",
"sha256": "1yr9j4ldpi2p2zgdq4mky6y5yh7nilasdmskapbdxp9fxwba2r0x",
"msg": "Update from Hackage at 2021-05-10T22:01:59Z"
}

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1783,10 +1783,6 @@ self: super: {
ihaskell-display = doJailbreak super.ihaskell-display;
ihaskell-basic = doJailbreak super.ihaskell-basic;
# too strict bounds on QuickCheck
# https://github.com/HeinrichApfelmus/hyper-haskell/issues/42
hyper-extra = doJailbreak super.hyper-extra;
# Fixes too strict version bounds on regex libraries
# Presumably to be removed at the next release
yi-language = appendPatch super.yi-language (pkgs.fetchpatch {
@ -1844,8 +1840,6 @@ self: super: {
};
};
phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch;
# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -4183,6 +4183,7 @@ broken-packages:
- simple-ui
- simple-units
- simple-vec3
- simplexmq
- simple-zipper
- singleton-dict
- singletons-th

8
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -77,6 +77,14 @@ default-package-overrides:
- gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 #
# 2021-05-11: the diagrams libraries still depends on pre 0.6,
# e. g. https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin presumably until base 4.15
- monoid-extras < 0.6
# 2021-05-11: Pin for hls 1.1.0
- ghcide == 1.2.*
- hls-plugin-api == 1.1.0.0
- hls-explicit-imports-plugin < 1.0.0.2
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.

33
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View File

@ -1,4 +1,4 @@
# Stackage Nightly 2021-05-07
# Stackage Nightly 2021-05-10
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -355,6 +355,7 @@ default-package-overrides:
- cayley-client ==0.4.15
- cborg ==0.2.5.0
- cborg-json ==0.2.2.0
- cdar-mBound ==0.1.0.1
- cereal ==0.5.8.1
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
@ -408,7 +409,7 @@ default-package-overrides:
- cmdargs ==0.10.21
- codec-beam ==0.2.0
- code-page ==0.2.1
- collect-errors ==0.1.0.0
- collect-errors ==0.1.1.0
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
- Color ==0.3.1
@ -985,7 +986,7 @@ default-package-overrides:
- hashmap ==1.3.3
- hashtables ==1.2.4.1
- haskeline ==0.8.1.2
- haskell-awk ==1.2
- haskell-awk ==1.2.0.1
- haskell-gi ==0.24.7
- haskell-gi-base ==0.24.5
- haskell-gi-overloading ==1.0
@ -1044,7 +1045,7 @@ default-package-overrides:
- hint ==0.9.0.4
- hjsmin ==0.2.0.4
- hkd-default ==1.1.0.0
- hkgr ==0.2.7
- hkgr ==0.3
- hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1
@ -1106,7 +1107,7 @@ default-package-overrides:
- hspec-expectations-json ==1.0.0.3
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
- hspec-golden ==0.2.0.0
- hspec-golden ==0.1.0.3
- hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2
- hspec-junit-formatter ==1.0.0.2
@ -1200,7 +1201,7 @@ default-package-overrides:
- hxt-tagsoup ==9.1.4
- hxt-unicode ==9.0.2.4
- hybrid-vectors ==0.2.2
- hyper ==0.2.1.0
- hyper ==0.2.1.1
- hyperloglog ==0.4.4
- hyphenation ==0.8.1
- iconv ==0.4.1.3
@ -1317,7 +1318,7 @@ default-package-overrides:
- kind-generics ==0.4.1.0
- kind-generics-th ==0.2.2.2
- kmeans ==0.1.3
- koji ==0.0.1
- koji ==0.0.2
- koofr-client ==1.0.0.3
- krank ==0.2.2
- kubernetes-webhook-haskell ==0.2.0.3
@ -1491,7 +1492,7 @@ default-package-overrides:
- mintty ==0.1.2
- missing-foreign ==0.1.1
- MissingH ==1.4.3.0
- mixed-types-num ==0.4.1
- mixed-types-num ==0.5.0.3
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
@ -1570,7 +1571,7 @@ default-package-overrides:
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.2.0.1
- mysql-simple ==0.4.5
- mysql-simple ==0.4.6
- n2o ==0.11.1
- nagios-check ==0.3.2
- names-th ==0.3.0.1
@ -1755,7 +1756,7 @@ default-package-overrides:
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.2.0
- pipes ==4.3.15
- pipes ==4.3.16
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2
@ -1864,7 +1865,7 @@ default-package-overrides:
- pureMD5 ==2.1.3
- purescript-bridge ==0.14.0.0
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==2.1.0.1
- pusher-http-haskell ==2.1.0.2
- pvar ==1.0.0.0
- PyF ==0.9.0.3
- qchas ==1.1.0.1
@ -2179,7 +2180,7 @@ default-package-overrides:
- splint ==1.0.1.4
- split ==0.2.3.4
- splitmix ==0.1.0.3
- splitmix-distributions ==0.7.0.0
- splitmix-distributions ==0.8.0.0
- spoon ==0.3.1
- spreadsheet ==0.1.3.8
- sqlcli ==0.2.2.0
@ -2187,9 +2188,9 @@ default-package-overrides:
- sqlite-simple ==0.4.18.0
- sql-words ==0.1.6.4
- squeal-postgresql ==0.7.0.1
- squeather ==0.6.0.0
- squeather ==0.8.0.0
- srcloc ==0.6
- stache ==2.2.1
- stache ==2.3.0
- stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2
- stateref ==0.3
@ -2491,7 +2492,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.14
- unliftio ==0.2.15
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@ -2665,7 +2666,7 @@ default-package-overrides:
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.6
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.6
- yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
- yesod-test ==1.6.12

926
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

46
pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch
View File

@ -1,46 +0,0 @@
diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs
--- phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-04-30 17:45:52.000000000 +0200
+++ phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-05-08 18:16:15.054951952 +0200
@@ -1,11 +1,11 @@
--- |
--- Module : Data.Phonetic.Languages.SpecificationsRead
--- Copyright : (c) OleksandrZhabenko 2021
--- License : MIT
--- Stability : Experimental
--- Maintainer : olexandr543@yahoo.com
---
-{-| Provides functions to read data specifications for other modules from textual files.
+{-|
+Module : Data.Phonetic.Languages.SpecificationsRead
+Copyright : (c) OleksandrZhabenko 2021
+License : MIT
+Stability : Experimental
+Maintainer : olexandr543@yahoo.com
+
+Provides functions to read data specifications for other modules from textual files.
-}
module Data.Phonetic.Languages.SpecificationsRead where
diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Main.hs phonetic-languages-phonetics-basics-0.5.1.0/Main.hs
--- phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-04-30 17:45:52.000000000 +0200
+++ phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-05-08 18:14:06.344145599 +0200
@@ -1,11 +1,11 @@
--- |
--- Module : Main
--- Copyright : (c) OleksandrZhabenko 2020-2021
--- License : MIT
--- Stability : Experimental
--- Maintainer : olexandr543@yahoo.com
---
-{-| Can be used to calculate the durations of the approximations of the phonemes
+{-|
+Module : Main
+Copyright : (c) OleksandrZhabenko 2020-2021
+License : MIT
+Stability : Experimental
+Maintainer : olexandr543@yahoo.com
+
+Can be used to calculate the durations of the approximations of the phonemes
using some prepared text with its correct (at least mostly) pronunciation.
The prepared text is located in the same directory and contains lines -the
phonetic language word and its duration in seconds separated with whitespace.