Merge pull request #127833 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
Joe Hermaszewski 2021-07-02 21:01:18 +08:00 committed by GitHub
commit a4acf6de68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 1342 additions and 722 deletions

View file

@ -17,9 +17,9 @@ trap "rm ${tmpfile}" 0
echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script."
echo "Generating a list of broken builds and displaying for manual confirmation ..."
maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile
maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile"
$EDITOR $tmpfile
$EDITOR "$tmpfile"
tail -n +3 "$broken_config" >> "$tmpfile"
@ -28,10 +28,11 @@ broken-packages:
# These packages don't compile.
EOF
# clear environment here to avoid things like allowing broken builds in
sort -iu "$tmpfile" >> "$broken_config"
maintainers/scripts/haskell/regenerate-hackage-packages.sh
maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
maintainers/scripts/haskell/regenerate-hackage-packages.sh
env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh
env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh
if [[ "${1:-}" == "--do-commit" ]]; then
git add $broken_config

View file

@ -1,6 +1,6 @@
{
"commit": "8005ce7c7ba90fa92db65f86c544623353a96cf8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8005ce7c7ba90fa92db65f86c544623353a96cf8.tar.gz",
"sha256": "1kzhh7h0csb0vh9avbjsm6hziaa3lbpmzp4pkij4s3bbl4l664aa",
"msg": "Update from Hackage at 2021-06-22T07:13:30Z"
"commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz",
"sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq",
"msg": "Update from Hackage at 2021-06-26T12:56:56Z"
}

View file

@ -706,10 +706,6 @@ self: super: {
uuid-types = doJailbreak super.uuid-types;
uuid = doJailbreak super.uuid;
# Bypass version check for random < 1.2 (1.2 works fine).
# https://github.com/yeyan/xmonad-wallpaper/issues/2
xmonad-wallpaper = doJailbreak super.xmonad-wallpaper;
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
@ -1936,4 +1932,12 @@ EOT
# https://github.com/dagit/zenc/issues/5
zenc = doJailbreak super.zenc;
# Indeterministic tests
# Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37
matrix-client = dontCheck super.matrix-client;
# Flakey tests
# upstream https://github.com/circuithub/rel8/issues/86
rel8 = dontCheck super.rel8;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -173,6 +173,7 @@ self: super: {
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin;
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
hls-splice-plugin = dontCheck super.hls-splice-plugin;
# We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres;

View file

@ -617,6 +617,7 @@ broken-packages:
- chunky
- church
- church-maybe
- churros
- cielo
- cil
- cinvoke
@ -1640,7 +1641,6 @@ broken-packages:
- gitter
- git-vogue
- gi-vips
- gi-wnck
- glade
- glapp
- Gleam
@ -2289,6 +2289,7 @@ broken-packages:
- hs-rs-notify
- hs-scrape
- hsseccomp
- hssh
- hs-snowtify
- hs-speedscope
- hsSqlite3
@ -2453,6 +2454,7 @@ broken-packages:
- initialize
- inject-function
- inline-asm
- inline-r
- inserts
- instana-haskell-trace-sdk
- instance-map
@ -2963,6 +2965,7 @@ broken-packages:
- mi
- miconix-test
- microbase
- microformats2-parser
- microgroove
- microlens-each
- micrologger
@ -3597,6 +3600,7 @@ broken-packages:
- plat
- platinum-parsing
- PlayingCards
- plex
- plist
- plist-buddy
- plot-gtk
@ -3979,6 +3983,7 @@ broken-packages:
- reversi
- ReviewBoard
- rewrite-inspector
- rfc
- rfc-prelude
- rhbzquery
- ribbit
@ -4869,6 +4874,7 @@ broken-packages:
- turing-music
- turtle-options
- tweak
- twee
- twentefp-websockets
- twfy-api-client
- twhs

View file

@ -218,6 +218,7 @@ package-maintainers:
- hlint
- hmatrix
- iCalendar
- matrix-client
- neuron
- optics
- reflex-dom
@ -356,6 +357,7 @@ unsupported-platforms:
gi-ibus: [ x86_64-darwin ]
gi-ostree: [ x86_64-darwin ]
gi-vte: [ x86_64-darwin ]
gi-wnck: [ x86_64-darwin ]
gnome-keyring: [ x86_64-darwin ]
gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
gtk-sni-tray: [ x86_64-darwin ]

View file

@ -44,6 +44,7 @@ in
, libraryFrameworkDepends ? [], executableFrameworkDepends ? []
, homepage ? "https://hackage.haskell.org/package/${pname}"
, platforms ? with lib.platforms; all # GHC can cross-compile
, badPlatforms ? lib.platforms.none
, hydraPlatforms ? null
, hyperlinkSource ? true
, isExecutable ? false, isLibrary ? !isExecutable
@ -289,7 +290,7 @@ in lib.fix (drv:
assert allPkgconfigDepends != [] -> pkg-config != null;
stdenv.mkDerivation ({
name = "${pname}-${version}";
inherit pname version;
outputs = [ "out" ]
++ (optional enableSeparateDataOutput "data")
@ -663,6 +664,7 @@ stdenv.mkDerivation ({
// optionalAttrs (args ? description) { inherit description; }
// optionalAttrs (args ? maintainers) { inherit maintainers; }
// optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
// optionalAttrs (args ? badPlatforms) { inherit badPlatforms; }
// optionalAttrs (args ? changelog) { inherit changelog; }
;

File diff suppressed because it is too large Load diff