Merge pull request #139967 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
sterni 2021-10-01 20:28:54 +02:00 committed by GitHub
commit bc4e52b697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 1097 additions and 784 deletions

View File

@ -0,0 +1,41 @@
{lib, stdenvNoCC, haskellPackages, fetchurl, writers}:
stdenvNoCC.mkDerivation rec {
pname = "hledger-check-fancyassertions";
version = "1.23";
src = fetchurl {
url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";
sha256 = "08p2din1j7l4c29ipn68k8vvs3ys004iy8a3zf318lzby4h04h0n";
};
dontUnpack = true;
dontBuild = true;
executable = writers.writeHaskell
"hledger-check-fancyassertions"
{
libraries = with haskellPackages; [
base base-compat base-compat-batteries filepath hledger-lib_1_23
megaparsec microlens optparse-applicative string-qq text time
transformers
];
inherit (haskellPackages) ghc;
}
src;
installPhase = ''
runHook preInstall
install -D $executable $out/bin/${pname}
runHook postInstall
'';
meta = with lib; {
description = "Complex account balance assertions for hledger journals";
homepage = "https://hledger.org/";
changelog = "https://github.com/simonmichael/hledger/blob/master/CHANGES.md";
license = licenses.gpl3;
maintainers = [ maintainers.DamienCassou ];
platforms = lib.platforms.all; # GHC can cross-compile
};
}

View File

@ -1,6 +1,6 @@
{
"commit": "e0bd041989865809059f6039125dfb93cb075f72",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bd041989865809059f6039125dfb93cb075f72.tar.gz",
"sha256": "1fpm2kawxlias5xxmiara6224akgii0mnwnlyklc8szflv9cbs17",
"msg": "Update from Hackage at 2021-09-19T21:23:33Z"
"commit": "85edb79d7ee62685f6ccc57b932ff3920affcb77",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/85edb79d7ee62685f6ccc57b932ff3920affcb77.tar.gz",
"sha256": "13yxypamp0pwx8mcslg4mgq5599cldhmfss881m22zqjkbqvi8sj",
"msg": "Update from Hackage at 2021-09-29T20:58:23Z"
}

View File

@ -856,6 +856,11 @@ self: super: {
stripLen = 1;
});
# hledger-lib 1.23 depends on doctest >= 0.18
hledger-lib_1_23 = super.hledger-lib_1_23.override {
doctest = self.doctest_0_18_1;
};
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
@ -1987,4 +1992,19 @@ EOT
hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0";
doJailbreak super.hw-xml;
# doctests fail due to deprecation warnings in 0.2
candid = assert pkgs.lib.versionOlder super.candid.version "0.3";
overrideCabal super.candid (drv: {
version = "0.3";
sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x";
libraryHaskellDepends = drv.libraryHaskellDepends ++ [
self.file-embed
];
});
# Needs network >= 3.1.2
quic = super.quic.overrideScope (self: super: {
network = self.network_3_1_2_2;
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -197,6 +197,7 @@ self: super: ({
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
# We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres;

View File

@ -155,7 +155,7 @@ self: super: {
# 2021-09-18: Need path >= 0.9.0 for ghc 9 compat
path = self.path_0_9_0;
# 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat
ormolu = self.ormolu_0_3_0_0;
ormolu = doDistribute self.ormolu_0_3_0_1;
# 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206
# Restrictive upper bound on ormolu
hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin;

View File

@ -53,7 +53,8 @@ self: super: {
# Jailbreaks & Version Updates
async = doJailbreak super.async;
ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms;
base64-bytestring = doJailbreak super.base64-bytestring;
ChasingBottoms = doJailbreak super.ChasingBottoms;
data-fix = doJailbreak super.data-fix;
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
@ -62,8 +63,9 @@ self: super: {
HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
lukko = doJailbreak super.lukko;
network = super.network_3_1_2_2;
parallel = doJailbreak super.parallel;
primitive = doJailbreak (dontCheck super.primitive);
primitive = doJailbreak super.primitive;
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
@ -88,14 +90,11 @@ self: super: {
});
# 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x
# Tests fail because random hasn't been updated for GHC 9.2.x
hashable = dontCheck super.hashable_1_3_3_0;
hashable = super.hashable_1_3_3_0;
# Tests fail because random hasn't been updated for GHC 9.2.x
unordered-containers = dontCheck super.unordered-containers;
# The test suite seems pretty broken.
base64-bytestring = dontCheck super.base64-bytestring;
# 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0
# The test suite indirectly depends on random, which leads to infinite recursion
random = dontCheck super.random_1_2_1;
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;

View File

@ -4269,6 +4269,7 @@ broken-packages:
- semialign-extras
- semibounded-lattices
- Semigroup
- semigroupoids-do
- semigroupoids-syntax
- semigroups-actions
- sendgrid-haskell
@ -4662,6 +4663,7 @@ broken-packages:
- streaming-utils
- streaming-with
- streamly-examples
- streamly-lz4
- streamly-process
- stream-monad
- streamproc
@ -4949,6 +4951,7 @@ broken-packages:
- Titim
- tkhs
- tkyprof
- tmp-proc-example
- todo
- tofromxml
- to-haskell
@ -5405,6 +5408,7 @@ broken-packages:
- xml-prettify
- xml-query
- xml-tydom-core
- xml-verify
- XMMS
- xmonad-bluetilebranch
- xmonad-contrib-gpl

View File

@ -271,6 +271,10 @@ package-maintainers:
- witch
ncfavier:
- lambdabot
nomeata:
- candid
- leb128-cereal
- tasty-expected-failure
pacien:
- ldgallery-compiler
peti:

View File

@ -1,4 +1,4 @@
# Stackage LTS 18.10
# Stackage LTS 18.12
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -172,7 +172,6 @@ default-package-overrides:
- ascii-progress ==0.3.3.0
- ascii-superset ==1.0.1.4
- ascii-th ==1.0.0.4
- asif ==6.0.4
- asn1-encoding ==0.9.6
- asn1-parse ==0.9.5
- asn1-types ==0.3.4
@ -195,7 +194,7 @@ default-package-overrides:
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- aur ==7.0.6
- aura ==3.2.5
- aura ==3.2.6
- authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- autoexporter ==1.1.20
@ -311,7 +310,7 @@ default-package-overrides:
- bv ==0.5
- bv-little ==1.1.1
- byteable ==0.1.1
- byte-count-reader ==0.10.1.5
- byte-count-reader ==0.10.1.6
- bytedump ==1.0
- byte-order ==0.1.2.0
- byteorder ==1.0.4
@ -331,7 +330,7 @@ default-package-overrides:
- c2hs ==0.28.8
- cabal2spec ==2.6.2
- cabal-appimage ==0.3.0.2
- cabal-clean ==0.1.20210815
- cabal-clean ==0.1.20210924
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
- cabal-file ==0.1.1
@ -395,7 +394,7 @@ default-package-overrides:
- cipher-des ==0.0.6
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- circular ==0.4.0.0
- circular ==0.4.0.1
- citeproc ==0.4.0.1
- clash-ghc ==1.4.3
- clash-lib ==1.4.3
@ -448,7 +447,7 @@ default-package-overrides:
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- conduino ==0.2.2.0
- conduit ==1.3.4.1
- conduit ==1.3.4.2
- conduit-algorithms ==0.0.11.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
@ -609,7 +608,7 @@ default-package-overrides:
- di-monad ==1.3.1
- directory-tree ==0.12.1
- direct-sqlite ==2.3.26
- dirichlet ==0.1.0.4
- dirichlet ==0.1.0.5
- discount ==0.1.1
- disk-free-space ==0.1.0.1
- distributed-closure ==0.4.2.0
@ -791,7 +790,7 @@ default-package-overrides:
- fmlist ==0.9.4
- fmt ==0.6.3.0
- fn ==0.3.0.2
- focus ==1.0.2
- focus ==1.0.3
- focuslist ==0.1.0.2
- foldable1 ==0.1.0.0
- fold-debounce ==0.2.0.9
@ -828,7 +827,7 @@ default-package-overrides:
- fusion-plugin ==0.2.3
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.0
- fuzzy ==0.1.0.1
- fuzzy-dates ==0.1.1.2
- fuzzyset ==0.2.1
- fuzzy-time ==0.1.0.0
@ -925,7 +924,7 @@ default-package-overrides:
- ginger ==0.10.1.0
- gingersnap ==0.3.1.0
- gi-pango ==1.0.24
- githash ==0.1.6.1
- githash ==0.1.6.2
- github-release ==1.3.7
- github-rest ==1.0.3
- github-types ==0.2.1
@ -1004,7 +1003,7 @@ default-package-overrides:
- haskell-src-meta ==0.8.7
- haskey-btree ==0.3.0.1
- hasktags ==0.72.0
- hasql ==1.4.5.1
- hasql ==1.4.5.2
- hasql-notifications ==0.2.0.0
- hasql-optparse-applicative ==0.3.0.6
- hasql-pool ==0.5.2
@ -1179,19 +1178,14 @@ default-package-overrides:
- hw-conduit ==0.2.1.0
- hw-conduit-merges ==0.2.1.0
- hw-diagnostics ==0.0.1.0
- hw-dsv ==0.4.1.0
- hweblib ==0.6.3
- hw-eliasfano ==0.1.2.0
- hw-excess ==0.2.3.0
- hw-fingertree ==0.1.2.0
- hw-fingertree-strict ==0.1.2.0
- hw-hedgehog ==0.1.1.0
- hw-hspec-hedgehog ==0.1.1.0
- hw-int ==0.0.2.0
- hw-ip ==2.4.2.0
- hw-json-simd ==0.1.1.0
- hw-json-simple-cursor ==0.1.1.0
- hw-json-standard-cursor ==0.2.3.1
- hw-kafka-client ==4.0.3
- hw-packed-vector ==0.2.1.0
- hw-parser ==0.1.1.0
@ -1202,7 +1196,6 @@ default-package-overrides:
- hw-streams ==0.0.1.0
- hw-string-parse ==0.0.0.4
- hw-succinct ==0.1.0.1
- hw-xml ==0.5.1.0
- hxt ==9.3.1.22
- hxt-charproperties ==9.5.0.0
- hxt-css ==0.1.0.3
@ -1396,7 +1389,7 @@ default-package-overrides:
- LibZip ==1.0.1
- lifted-async ==0.10.2.1
- lifted-base ==0.2.3.12
- lift-generics ==0.2
- lift-generics ==0.2.1
- lift-type ==0.1.0.1
- line ==4.0.1
- linear ==1.21.6
@ -1410,7 +1403,7 @@ default-package-overrides:
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==1.0.0.5
- list-t ==1.0.4
- list-t ==1.0.5
- list-transformer ==1.0.7
- ListTree ==0.2.3
- literatex ==0.1.0.2
@ -1443,7 +1436,7 @@ default-package-overrides:
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3
- lzma-clib ==5.2.2
- lzma-conduit ==1.2.1
- lzma-conduit ==1.2.2
- machines ==0.7.2
- machines-binary ==7.0.0.0
- magic ==1.1
@ -1528,7 +1521,7 @@ default-package-overrides:
- mock-time ==0.1.0
- mod ==0.1.2.2
- model ==0.5
- modern-uri ==0.3.4.1
- modern-uri ==0.3.4.2
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.3.1
@ -1563,7 +1556,7 @@ default-package-overrides:
- mongoDB ==2.7.1.1
- monoid-subclasses ==1.1.1
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1
- mono-traversable ==1.0.15.3
- mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.1.0
- more-containers ==0.2.2.2
@ -1748,7 +1741,7 @@ default-package-overrides:
- pathtype ==0.8.1.1
- pathwalk ==0.3.1.2
- pattern-arrows ==0.0.2
- pava ==0.1.1.1
- pava ==0.1.1.2
- pcg-random ==0.1.3.7
- pcre2 ==1.1.5
- pcre-heavy ==1.0.0.2
@ -1838,12 +1831,12 @@ default-package-overrides:
- pretty-class ==1.0.1.1
- pretty-diff ==0.4.0.3
- pretty-hex ==1.1
- prettyprinter ==1.7.0
- prettyprinter-ansi-terminal ==1.1.2
- prettyprinter ==1.7.1
- prettyprinter-ansi-terminal ==1.1.3
- prettyprinter-compat-annotated-wl-pprint ==1.1
- prettyprinter-compat-ansi-wl-pprint ==1.0.1
- prettyprinter-compat-wl-pprint ==1.0.0.1
- prettyprinter-convert-ansi-wl-pprint ==1.1.1
- prettyprinter-compat-ansi-wl-pprint ==1.0.2
- prettyprinter-compat-wl-pprint ==1.0.1
- prettyprinter-convert-ansi-wl-pprint ==1.1.2
- pretty-relative-time ==0.2.0.0
- pretty-show ==1.10
- pretty-simple ==4.0.0.0
@ -1930,7 +1923,7 @@ default-package-overrides:
- Ranged-sets ==0.4.0
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.1
- rank2classes ==1.4.2
- rank2classes ==1.4.3
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==1.0.15
@ -1975,7 +1968,7 @@ default-package-overrides:
- regex-compat ==0.95.2.1
- regex-compat-tdfa ==0.95.1.4
- regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43
- regex-pcre-builtin ==0.95.2.3.8.44
- regex-posix ==0.96.0.1
- regex-posix-clib ==2.7
- regex-tdfa ==1.3.1.1
@ -2127,7 +2120,7 @@ default-package-overrides:
- set-cover ==0.1.1
- setenv ==0.1.1.3
- setlocale ==1.0.0.10
- sexp-grammar ==2.3.1
- sexp-grammar ==2.3.2
- SHA ==1.6.4.4
- shake ==0.19.6
- shake-language-c ==0.12.0
@ -2175,7 +2168,7 @@ default-package-overrides:
- skylighting-core ==0.10.5.2
- slack-api ==0.12
- slack-progressbar ==0.1.0.1
- slick ==1.1.1.0
- slick ==1.1.2.2
- slist ==0.2.0.0
- slynx ==0.5.1.1
- smallcheck ==1.2.1
@ -2339,7 +2332,7 @@ default-package-overrides:
- tasty-program ==1.0.5
- tasty-quickcheck ==0.10.1.2
- tasty-rerun ==1.1.18
- tasty-silver ==3.2.2
- tasty-silver ==3.2.3
- tasty-smallcheck ==0.8.2
- tasty-test-reporter ==0.1.1.4
- tasty-th ==0.1.7
@ -2367,7 +2360,7 @@ default-package-overrides:
- texmath ==0.12.3.1
- text-ansi ==0.1.1
- text-binary ==0.2.1.1
- text-builder ==0.6.6.2
- text-builder ==0.6.6.3
- text-conversions ==0.3.1
- text-format ==0.3.2
- text-icu ==0.7.1.0
@ -2568,7 +2561,7 @@ default-package-overrides:
- vault ==0.3.1.5
- vcs-ignore ==0.0.1.0
- vec ==0.4
- vector ==0.12.3.0
- vector ==0.12.3.1
- vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.2
- vector-buffer ==0.4.1
@ -2689,7 +2682,7 @@ default-package-overrides:
- xmonad-extras ==0.15.3
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- yaml ==0.11.6.0
- yamlparse-applicative ==0.2.0.0
- yesod ==1.6.1.2
- yesod-auth ==1.6.10.4

View File

@ -489,7 +489,6 @@ dont-distribute-packages:
- atuin
- audiovisual
- aura
- aura_3_2_6
- authoring
- autonix-deps-kf5
- avers

View File

@ -932,6 +932,8 @@ self: super: builtins.intersectAttrs super {
# Runtime dependencies and CLI completion
nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal
super.nvfetcher (drv: {
# test needs network
doCheck = false;
buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${

File diff suppressed because it is too large Load Diff

View File

@ -25033,6 +25033,7 @@ with pkgs;
hivelytracker = callPackage ../applications/audio/hivelytracker { };
hledger = haskell.lib.justStaticExecutables haskellPackages.hledger;
hledger-check-fancyassertions = callPackage ../applications/office/hledger-check-fancyassertions { };
hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd;
hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest;
hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui;

View File

@ -175,6 +175,7 @@ let
hinit
hedgewars
hledger
hledger-check-fancyassertions
hledger-iadd
hledger-interest
hledger-ui