Merge pull request #228965 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2023-05-10 22:45:32 +02:00 committed by GitHub
commit b3fb03d00f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 982 additions and 984 deletions

View File

@ -14362,6 +14362,12 @@
githubId = 487050;
name = "Shea Levy";
};
shlok = {
email = "sd-nix-maintainer@quant.is";
github = "shlok";
githubId = 3000933;
name = "Shlok Datye";
};
shmish111 = {
email = "shmish111@gmail.com";
github = "shmish111";

View File

@ -85,7 +85,8 @@ echo "Updating Stackage..."
echo "Updating Hackage hashes..."
./maintainers/scripts/haskell/update-hackage.sh --do-commit
echo "Regenerating Hackage packages..."
./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit
# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check.
./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit
# Push these new commits to the haskell-updates branch
echo "Pushing commits just created to the remote haskell-updates branch..."

View File

@ -1,9 +1,18 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils jq nix -I nixpkgs=.
set -euo pipefail
TMP_TEMPLATE=transitive-broken.XXXXXXX
readonly TMP_TEMPLATE
tmpfile=$(mktemp "$TMP_TEMPLATE")
trap 'rm -f "${tmpfile}"' 0
config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
cat > $config_file << EOF
cat > $tmpfile << EOF
# This file is automatically generated by
# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
# It is supposed to list all haskellPackages that cannot evaluate because they
@ -11,4 +20,6 @@ cat > $config_file << EOF
dont-distribute-packages:
EOF
nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file
nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $tmpfile
mv $tmpfile $config_file

View File

@ -68,10 +68,23 @@ mkDerivation (common "tamarin-prover" src // {
isExecutable = true;
patches = [
# Backport of https://github.com/tamarin-prover/tamarin-prover/pull/536 to 1.6.1
# Backport unreleased patch allowing maude 3.2.1
(fetchpatch {
url = "https://github.com/tamarin-prover/tamarin-prover/commit/95fbace0c5cbea57b5f320f6bb4d0387a4beab8d.patch";
sha256 = "sha256-Wjf7C208kcskEN1op//HQZnhoZopKQS42JvE8kV5NhI=";
name = "tamarin-prover-allow-maude-3.2.1.patch";
url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch";
sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg";
})
# Backport unreleased patch allowing maude 3.2.2
(fetchpatch {
name = "tamarin-prover-allow-maude-3.2.2.patch";
url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch";
sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy";
})
# Backport proposed patch allowing maude 3.3 and 3.3.1
(fetchpatch {
name = "tamarin-prover-allow-maude-3.3.patch";
url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch";
sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681";
})
];

View File

@ -1,6 +1,6 @@
{
"commit": "835ef6db789d6459876c083419d61e068de15dd3",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/835ef6db789d6459876c083419d61e068de15dd3.tar.gz",
"sha256": "11506nwsd15b3jhdydr54j0jk5pzj3qhs92c167xv0f0czw5pj8a",
"msg": "Update from Hackage at 2023-04-22T18:19:29Z"
"commit": "54b1e8a3a0447c7b969fd97816c4c0821ba9fec1",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/54b1e8a3a0447c7b969fd97816c4c0821ba9fec1.tar.gz",
"sha256": "1lryj166qysqkmdy9ll15dvg9f797zmy8brzpbavxb149pa6b0j9",
"msg": "Update from Hackage at 2023-04-29T17:51:14Z"
}

View File

@ -1,5 +1,5 @@
import ./common-hadrian.nix {
version = "9.7.20230406";
rev = "04b80850c535fa8c11f435711577296a99499105";
sha256 = "190fpgg8sbcfp2l62vaqhk3wddkbz8vf5ivd7hw5gkcyyn5px3q9";
version = "9.7.20230505";
rev = "983ce55815f2dd57f84ee86eee97febf7d80b470";
sha256 = "sha256-U+LZIe9WbF/DF5Zn8w8wkRf4JJHxgdY2ahM517bwRo4=";
}

View File

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2023-04-11";
version = "unstable-2023-05-05";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz";
sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y";
url = "https://github.com/NixOS/cabal2nix/archive/078350047d358bb450d634d775493aba89b21212.tar.gz";
sha256 = "0rsdn2zyw0zr6pi3dg6cm3i310alppigdsv20iqpx0dzykkicywj";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;

View File

@ -61,15 +61,15 @@ self: super: {
# not solvable short of recompiling GHC. Instead of adding
# allowInconsistentDependencies for all reverse dependencies of hspec-core,
# just upgrade to an hspec version without the offending dependency.
hspec-core = cself.hspec-core_2_11_0;
hspec-discover = cself.hspec-discover_2_11_0;
hspec = cself.hspec_2_11_0;
hspec-core = cself.hspec-core_2_11_0_1;
hspec-discover = cself.hspec-discover_2_11_0_1;
hspec = cself.hspec_2_11_0_1;
# hspec-discover and hspec-core depend on hspec-meta for testing which
# we need to avoid since it depends on ghc as well. Since hspec*_2_10*
# are overridden to take the versioned attributes as inputs, we need
# to make sure to override the versioned attribute with this fix.
hspec-discover_2_11_0 = dontCheck csuper.hspec-discover_2_11_0;
hspec-discover_2_11_0_1 = dontCheck csuper.hspec-discover_2_11_0_1;
# Prevent dependency on doctest which causes an inconsistent dependency
# due to depending on ghc which depends on directory etc.
@ -85,7 +85,7 @@ self: super: {
(super.guardian.overrideScope (self: super:
cabalInstallOverlay self super // {
# Needs at least path-io 1.8.0 due to canonicalizePath changes
path-io = self.path-io_1_8_0;
path-io = self.path-io_1_8_1;
}
))
[
@ -193,6 +193,10 @@ self: super: {
# For -f-auto see cabal.project in haskell-language-server.
ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);
# Test ldap server test/ldap.js is missing from sdist
# https://github.com/supki/ldap-client/issues/18
ldap-client-og = dontCheck super.ldap-client-og;
# For -fghc-lib see cabal.project in haskell-language-server.
stylish-haskell = if lib.versionAtLeast super.ghc.version "9.2"
then enableCabalFlag "ghc-lib"
@ -205,6 +209,9 @@ self: super: {
### END HASKELL-LANGUAGE-SERVER SECTION ###
###########################################
# Remove when Stackage LTS advances to this version, should be LTS-20.20
utility-ht = doDistribute self.utility-ht_0_0_17;
vector = overrideCabal (old: {
# Too strict bounds on doctest which isn't used, but is part of the configuration
jailbreak = true;
@ -409,6 +416,22 @@ self: super: {
# 2022-02-14: Strict upper bound: https://github.com/psibi/streamly-bytestring/issues/30
streamly-bytestring = dontCheck (doJailbreak super.streamly-bytestring);
# The package requires streamly == 0.9.*.
# (We can remove this once the assert starts failing.)
streamly-archive = super.streamly-archive.override {
streamly =
assert (builtins.compareVersions pkgs.haskellPackages.streamly.version "0.9.0" < 0);
pkgs.haskellPackages.streamly_0_9_0;
};
# The package requires streamly == 0.9.*.
# (We can remove this once the assert starts failing.)
streamly-lmdb = super.streamly-lmdb.override {
streamly =
assert (builtins.compareVersions pkgs.haskellPackages.streamly.version "0.9.0" < 0);
pkgs.haskellPackages.streamly_0_9_0;
};
# base bound
digit = doJailbreak super.digit;
@ -630,10 +653,6 @@ self: super: {
})
] (dontCheck super.snappy);
# 2023-04-22: omfort-fftw 0.0.0.1 contains fixes to the tests. We can drop
# this override as soon as stackage advances.
comfort-fftw = doDistribute super.comfort-fftw_0_0_0_1;
# https://github.com/vincenthz/hs-crypto-pubkey/issues/20
crypto-pubkey = dontCheck super.crypto-pubkey;
@ -1005,12 +1024,12 @@ self: super: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override {
hspec = self.hspec_2_11_0;
hspec = self.hspec_2_11_0_1;
hspec-wai = self.hspec-wai.override {
hspec = self.hspec_2_11_0;
hspec = self.hspec_2_11_0_1;
};
hspec-contrib = self.hspec-contrib.override {
hspec-core = self.hspec-core_2_11_0;
hspec-core = self.hspec-core_2_11_0_1;
};
fsnotify = self.fsnotify_0_4_1_0;
});
@ -1604,6 +1623,7 @@ self: super: {
# Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x.
# So let's not go there and just disable the tests altogether.
hspec-core = dontCheck super.hspec-core;
hspec-core_2_7_10 = doDistribute (dontCheck super.hspec-core_2_7_10);
# tests seem to require a different version of hspec-core
hspec-contrib = dontCheck super.hspec-contrib;
@ -1674,16 +1694,16 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_11_0 = doDistribute (super.hspec_2_11_0.override {
hspec-discover = self.hspec-discover_2_11_0;
hspec-core = self.hspec-core_2_11_0;
hspec_2_11_0_1 = doDistribute (super.hspec_2_11_0_1.override {
hspec-discover = self.hspec-discover_2_11_0_1;
hspec-core = self.hspec-core_2_11_0_1;
});
hspec-discover_2_11_0 = doDistribute (super.hspec-discover_2_11_0.override {
hspec-discover_2_11_0_1 = doDistribute (super.hspec-discover_2_11_0_1.override {
hspec-meta = self.hspec-meta_2_10_5;
});
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0
# Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0_1
# is overlayed to hspec-core.
hspec-core_2_11_0 = doDistribute (dontCheck (super.hspec-core_2_11_0.override {
hspec-core_2_11_0_1 = doDistribute (dontCheck (super.hspec-core_2_11_0_1.override {
hspec-meta = self.hspec-meta_2_10_5;
}));
@ -2632,4 +2652,13 @@ self: super: {
# libfuse3 fails to mount fuse file systems within the build environment
libfuse3 = dontCheck super.libfuse3;
# Tests fail due to the newly-build fourmolu not being in PATH
# https://github.com/fourmolu/fourmolu/issues/231
fourmolu_0_12_0_0 = dontCheck (super.fourmolu_0_12_0_0.overrideScope (lself: lsuper: {
Cabal-syntax = lself.Cabal-syntax_3_10_1_0;
ghc-lib-parser = lself.ghc-lib-parser_9_6_1_20230312;
parsec = lself.parsec_3_1_16_1;
text = lself.text_2_0_2;
}));
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -27,7 +27,7 @@ self: super:
# GHCJS does not ship with the same core packages as GHC.
# https://github.com/ghcjs/ghcjs/issues/676
stm = doJailbreak self.stm_2_5_1_0;
exceptions = dontCheck self.exceptions_0_10_5;
exceptions = dontCheck self.exceptions_0_10_7;
## OTHER PACKAGES
@ -108,4 +108,26 @@ self: super:
# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
zenc = dontCheck super.zenc;
hspec = self.hspec_2_7_10;
hspec-core = self.hspec-core_2_7_10;
hspec-meta = self.hspec-meta_2_7_8;
hspec-discover = self.hspec-discover_2_7_10;
# ReferenceError: h$primop_ShrinkSmallMutableArrayOp_Char is not defined
unordered-containers = dontCheck super.unordered-containers;
# Without this revert, test suites using tasty fail with:
# ReferenceError: h$getMonotonicNSec is not defined
# https://github.com/UnkindPartition/tasty/pull/345#issuecomment-1538216407
tasty = appendPatch (pkgs.fetchpatch {
name = "tasty-ghcjs.patch";
url = "https://github.com/UnkindPartition/tasty/commit/e692065642fd09b82acccea610ad8f49edd207df.patch";
revert = true;
relative = "core";
hash = "sha256-ryABU2ywkVOEPC/jWv8humT3HaRpCwMYEk+Ux3hhi/M=";
}) super.tasty;
# Tests take unacceptably long.
vector = dontCheck super.vector;
}

View File

@ -1173,8 +1173,10 @@ broken-packages:
- directed-cubical
- direct-fastcgi
- direct-http
- directory-ospath-streaming # dependency missing in job https://hydra.nixos.org/build/219209527 at 2023-05-10
- direct-plugins
- direm
- disco # failure building library in job https://hydra.nixos.org/build/219207076 at 2023-05-10
- discordian-calendar
- discord-register
- discord-types
@ -1897,6 +1899,7 @@ broken-packages:
- Grempa
- greplicate
- gridfs
- grid-proto # failure building library in job https://hydra.nixos.org/build/219248049 at 2023-05-10
- grids
- grm
- GroteTrap
@ -5018,6 +5021,7 @@ broken-packages:
- sqlvalue-list
- srcinst
- srt-dhall
- srtree # dependency missing in job https://hydra.nixos.org/build/219208055 at 2023-05-10
- sscan
- ssh
- ssh-tunnel
@ -5106,11 +5110,9 @@ broken-packages:
- streaming-png
- streaming-postgresql-simple
- streaming-sort
- streamly-archive
- streamly-binary
- streamly-cassava
- streamly-examples
- streamly-lmdb
- streamly-lz4
- streamly-process
- stream-monad
@ -5584,6 +5586,7 @@ broken-packages:
- unamb-custom
- unbeliever
- unbounded-delays-units
- unbound-kind-generics # failure building library in job https://hydra.nixos.org/build/219201570 at 2023-05-10
- unboxed
- unboxed-containers
- unboxed-references
@ -5773,6 +5776,7 @@ broken-packages:
- wai-middleware-travisci
- wai-middleware-validation
- wai-predicates
- wai-problem-details # dependency missing in job https://hydra.nixos.org/build/219206235 at 2023-05-10
- wai-rate-limit-postgres
- wai-rate-limit-redis
- wai-request-spec

View File

@ -368,6 +368,9 @@ package-maintainers:
- taffybar
- arbtt
- lentil
shlok:
- streamly-archive
- streamly-lmdb
sorki:
- cayenne-lpp
- blockfrost-client

View File

@ -1,4 +1,4 @@
# Stackage LTS 20.18
# Stackage LTS 20.19
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -16,7 +16,7 @@ default-package-overrides:
- adjunctions ==4.4.2
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.4
- aern2-mp ==0.2.11.0
- aern2-mp ==0.2.15.0
- aern2-real ==0.2.11.0
- aeson ==2.0.3.0
- aeson-attoparsec ==0.0.0
@ -43,7 +43,7 @@ default-package-overrides:
- al ==0.1.4.2
- alarmclock ==0.7.0.6
- alerts ==0.1.2.0
- alex ==3.2.7.2
- alex ==3.2.7.3
- alex-meta ==0.3.0.13
- algebra ==4.3.1
- algebraic-graphs ==0.6.1
@ -81,7 +81,7 @@ default-package-overrides:
- app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.1
- arbtt ==0.12.0.1
- arithmoi ==0.12.0.2
- arithmoi ==0.12.1.0
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
@ -217,7 +217,7 @@ default-package-overrides:
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.3.1
- bloodhound ==0.21.0.0
- bm ==0.1.0.2
- bm ==0.1.1.0
- bmp ==1.2.6.3
- bnb-staking-csvs ==0.2.1.0
- BNFC ==2.9.4.1
@ -253,12 +253,12 @@ default-package-overrides:
- bugsnag-wai ==1.0.0.1
- bugsnag-yesod ==1.0.0.1
- bugzilla-redhat ==1.0.1
- burrito ==2.0.1.5
- burrito ==2.0.1.6
- butcher ==1.3.3.2
- bv ==0.5
- byteable ==0.1.1
- bytebuild ==0.3.12.0
- byte-count-reader ==0.10.1.9
- byte-count-reader ==0.10.1.10
- bytedump ==1.0
- bytehash ==0.1.0.0
- byte-order ==0.1.3.0
@ -380,7 +380,7 @@ default-package-overrides:
- combinatorial ==0.1.1
- comfort-array ==0.5.2.1
- comfort-array-shape ==0.0
- comfort-fftw ==0.0
- comfort-fftw ==0.0.0.1
- comfort-graph ==0.0.3.2
- commonmark ==0.2.2
- commonmark-extensions ==0.2.3.4
@ -447,8 +447,8 @@ default-package-overrides:
- cookie ==0.4.6
- copr-api ==0.1.0
- core-data ==0.3.9.1
- core-program ==0.6.5.1
- core-telemetry ==0.2.8.0
- core-program ==0.6.6.0
- core-telemetry ==0.2.9.1
- core-text ==0.3.8.1
- countable ==1.2
- country ==0.2.3
@ -486,7 +486,7 @@ default-package-overrides:
- crypt-sha512 ==0
- csp ==1.4.0
- css-text ==0.1.3.0
- c-struct ==0.1.1.2
- c-struct ==0.1.1.3
- csv ==0.1.2
- csv-conduit ==0.7.3.0
- ctrie ==0.2
@ -580,7 +580,7 @@ default-package-overrides:
- dhall ==1.41.2
- dhall-bash ==1.0.40
- dhall-json ==1.7.11
- dhall-yaml ==1.2.11
- dhall-yaml ==1.2.12
- di ==1.3
- diagrams ==1.4.0.1
- diagrams-builder ==0.8.0.5
@ -613,7 +613,7 @@ default-package-overrides:
- distributive ==0.6.2.1
- diversity ==0.8.1.0
- djinn-lib ==0.0.1.4
- dl-fedora ==0.9.4
- dl-fedora ==0.9.5
- dlist ==1.0
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.2
@ -658,7 +658,7 @@ default-package-overrides:
- dyre ==0.9.1
- eap ==0.9.0.2
- Earley ==0.13.0.1
- easy-file ==0.2.3
- easy-file ==0.2.4
- easy-logger ==0.1.0.7
- Ebnf2ps ==1.0.15
- echo ==0.1.4
@ -860,14 +860,14 @@ default-package-overrides:
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.14.3
- generic-functor ==1.1.0.0
- generic-lens ==2.2.1.0
- generic-lens ==2.2.2.0
- generic-lens-core ==2.2.1.0
- generic-monoid ==0.1.0.1
- generic-optics ==2.2.1.0
- GenericPretty ==1.2.2
- generic-random ==1.5.0.1
- generics-eot ==0.4.0.1
- generics-sop ==0.5.1.2
- generics-sop ==0.5.1.3
- generics-sop-lens ==0.2.0.1
- genvalidity ==1.1.0.0
- genvalidity-aeson ==1.0.0.1
@ -1073,7 +1073,7 @@ default-package-overrides:
- hedgehog-fakedata ==0.0.1.5
- hedgehog-fn ==1.0
- hedgehog-quickcheck ==0.1.1
- hedis ==0.15.1
- hedis ==0.15.2
- hedn ==0.3.0.4
- here ==1.2.13
- heredoc ==0.2.0.0
@ -1318,7 +1318,7 @@ default-package-overrides:
- inline-c-cpp ==0.5.0.0
- inliterate ==0.1.0
- input-parsers ==0.2.3.2
- insert-ordered-containers ==0.2.5.1
- insert-ordered-containers ==0.2.5.2
- inspection-testing ==0.4.6.1
- instance-control ==0.1.2.0
- integer-logarithms ==1.0.3.1
@ -1376,7 +1376,7 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.10
- json-feed ==2.0.0.7
- json-feed ==2.0.0.8
- jsonifier ==0.2.1.2
- jsonpath ==0.3.0.0
- json-rpc ==1.0.4
@ -1409,7 +1409,7 @@ default-package-overrides:
- koji ==0.0.2
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==2.0.0.5
- lackey ==2.0.0.6
- LambdaHack ==0.11.0.0
- lame ==0.2.0
- language-avro ==0.1.4.0
@ -1452,7 +1452,7 @@ default-package-overrides:
- lens-properties ==4.11.1
- lens-regex ==0.1.3
- lens-regex-pcre ==1.1.0.0
- lentil ==1.5.5.1
- lentil ==1.5.5.2
- LetsBeRational ==1.0.0.0
- leveldb-haskell ==0.6.5
- lexer-applicative ==2.1.0.2
@ -1471,7 +1471,7 @@ default-package-overrides:
- linear ==1.21.10
- linear-base ==0.3.1
- linear-generics ==0.2.1
- linebreak ==1.1.0.3
- linebreak ==1.1.0.4
- linenoise ==0.3.2
- linux-capabilities ==0.1.1.0
- linux-file-extents ==0.2.0.0
@ -1516,7 +1516,7 @@ default-package-overrides:
- lxd-client-config ==0.1.0.1
- lz4 ==0.2.3.1
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.4
- lzma ==0.0.1.0
- lzma-clib ==5.2.2
- lzma-conduit ==1.2.3
- machines ==0.7.3
@ -1619,7 +1619,7 @@ default-package-overrides:
- monadlist ==0.0.2
- monadloc ==0.7.1
- monad-logger ==0.3.39
- monad-logger-aeson ==0.4.0.3
- monad-logger-aeson ==0.4.0.4
- monad-logger-json ==0.1.0.0
- monad-logger-logstash ==0.2.0.2
- monad-logger-prefix ==0.1.12
@ -1652,15 +1652,15 @@ default-package-overrides:
- mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.2.0
- more-containers ==0.2.2.2
- morpheus-graphql ==0.27.1
- morpheus-graphql-app ==0.27.1
- morpheus-graphql-client ==0.27.1
- morpheus-graphql-code-gen ==0.27.1
- morpheus-graphql-code-gen-utils ==0.27.1
- morpheus-graphql-core ==0.27.1
- morpheus-graphql-server ==0.27.1
- morpheus-graphql-subscriptions ==0.27.1
- morpheus-graphql-tests ==0.27.1
- morpheus-graphql ==0.27.2
- morpheus-graphql-app ==0.27.2
- morpheus-graphql-client ==0.27.2
- morpheus-graphql-code-gen ==0.27.2
- morpheus-graphql-code-gen-utils ==0.27.2
- morpheus-graphql-core ==0.27.2
- morpheus-graphql-server ==0.27.2
- morpheus-graphql-subscriptions ==0.27.2
- morpheus-graphql-tests ==0.27.2
- moss ==0.2.0.1
- mountpoints ==1.0.2
- mpi-hs ==0.7.2.0
@ -1780,7 +1780,7 @@ default-package-overrides:
- OneTuple ==0.3.1
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.9.6.1
- opaleye ==0.9.6.2
- OpenAL ==1.7.0.5
- openapi3 ==3.2.3
- open-browser ==0.2.1.0
@ -1995,7 +1995,7 @@ default-package-overrides:
- print-console-colors ==0.1.0.0
- probability ==0.2.8
- process-extras ==0.7.4
- product-profunctors ==0.11.0.3
- product-profunctors ==0.11.1.1
- profiterole ==0.1
- profiteur ==0.4.6.1
- profunctors ==5.6.2
@ -2012,12 +2012,12 @@ default-package-overrides:
- protobuf-simple ==0.1.1.1
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.7.1.2
- proto-lens ==0.7.1.3
- proto-lens-arbitrary ==0.1.2.11
- proto-lens-optparse ==0.1.1.9
- proto-lens-optparse ==0.1.1.10
- proto-lens-protobuf-types ==0.7.1.2
- proto-lens-protoc ==0.7.1.1
- proto-lens-runtime ==0.7.0.3
- proto-lens-runtime ==0.7.0.4
- proto-lens-setup ==0.4.0.6
- protolude ==0.3.3
- proxied ==0.3.1
@ -2035,8 +2035,8 @@ default-package-overrides:
- PyF ==0.11.1.1
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.1.0
- qrcode-core ==0.9.6
- qrcode-juicypixels ==0.8.4
- qrcode-core ==0.9.7
- qrcode-juicypixels ==0.8.5
- quadratic-irrational ==0.1.1
- QuasiText ==0.1.2.6
- QuickCheck ==2.14.2
@ -2049,7 +2049,7 @@ default-package-overrides:
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.1.1
- quickcheck-special ==0.1.0.6
- quickcheck-state-machine ==0.7.1
- quickcheck-state-machine ==0.7.2
- quickcheck-text ==0.1.2.1
- quickcheck-transformer ==0.3.1.2
- quickcheck-unicode ==1.0.1.0
@ -2060,12 +2060,12 @@ default-package-overrides:
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- ral ==0.2.1
- rampart ==2.0.0.5
- rampart ==2.0.0.6
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.2.1.1
- random-bytestring ==0.1.4
- random-fu ==0.3.0.0
- random-fu ==0.3.0.1
- random-shuffle ==0.0.4
- random-tree ==0.6.0.5
- range ==0.3.0.2
@ -2077,7 +2077,7 @@ default-package-overrides:
- rank2classes ==1.4.6
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==2.0.0.7
- ratel ==2.0.0.8
- ratel-wai ==2.0.0.4
- ratio-int ==0.1.2
- rattle ==0.2
@ -2151,7 +2151,7 @@ default-package-overrides:
- resource-pool ==0.2.3.2
- resourcet ==1.2.6
- result ==0.2.6.0
- retry ==0.9.3.0
- retry ==0.9.3.1
- rev-state ==0.1.2
- rex ==0.6.2
- rfc1751 ==0.1.3
@ -2181,7 +2181,7 @@ default-package-overrides:
- run-haskell-module ==0.0.2
- runmemo ==1.0.0.1
- run-st ==0.1.1.0
- rvar ==0.3.0.1
- rvar ==0.3.0.2
- s3-signer ==0.5.0.0
- safe ==0.3.19
- safe-coloured-text ==0.2.0.1
@ -2203,9 +2203,9 @@ default-package-overrides:
- sample-frame-np ==0.0.5
- sampling ==0.3.5
- sandi ==0.5
- sandwich ==0.1.3.1
- sandwich ==0.1.3.2
- sandwich-hedgehog ==0.1.1.0
- sandwich-quickcheck ==0.1.0.6
- sandwich-quickcheck ==0.1.0.7
- sandwich-slack ==0.1.1.0
- sandwich-webdriver ==0.1.2.0
- say ==0.1.0.1
@ -2221,7 +2221,7 @@ default-package-overrides:
- scientist ==0.0.0.0
- scotty ==0.12.1
- scrypt ==0.5.0
- sdl2 ==2.5.4.0
- sdl2 ==2.5.5.0
- sdl2-gfx ==0.3.0.0
- sdl2-image ==2.1.0.0
- sdl2-mixer ==1.2.0.0
@ -2244,7 +2244,7 @@ default-package-overrides:
- semiring-simple ==1.0.0.1
- semver ==0.4.0.1
- sendfile ==0.7.11.4
- sendgrid-v3 ==1.0.0.0
- sendgrid-v3 ==1.0.0.1
- seqalign ==0.2.0.4
- seqid ==0.6.2
- seqid-streams ==0.7.2
@ -2335,7 +2335,7 @@ default-package-overrides:
- simple-media-timestamp-attoparsec ==0.1.0.0
- simple-media-timestamp-formatting ==0.1.1.0
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.30
- simple-sendfile ==0.2.31
- simple-vec3 ==0.6.0.1
- since ==0.0.0
- singleton-bool ==0.1.6
@ -2423,7 +2423,7 @@ default-package-overrides:
- stm-containers ==1.2.0.2
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- stm-hamt ==1.2.0.10
- stm-hamt ==1.2.0.11
- stm-lifted ==2.5.0.0
- STMonadTrans ==0.4.6
- stm-split ==0.0.2.1
@ -2451,7 +2451,7 @@ default-package-overrides:
- strict-base-types ==0.7
- strict-concurrency ==0.2.4.3
- strict-lens ==0.4.0.2
- strict-list ==0.1.7
- strict-list ==0.1.7.1
- strict-tuple ==0.1.5.2
- strict-wrapper ==0.0.0.0
- stringable ==0.1.3
@ -2460,7 +2460,7 @@ default-package-overrides:
- string-combinators ==0.6.0.5
- string-conv ==0.2.0
- string-conversions ==0.4.0.1
- string-interpolate ==0.3.2.0
- string-interpolate ==0.3.2.1
- stringprep ==1.0.0
- string-qq ==0.0.4
- string-random ==0.1.4.3
@ -2482,7 +2482,7 @@ default-package-overrides:
- svg-builder ==0.1.1
- SVGFonts ==1.8.0.1
- svg-tree ==0.6.2.4
- swagger2 ==2.8.6
- swagger2 ==2.8.7
- swish ==0.10.4.0
- syb ==0.7.2.3
- syb-with-class ==0.6.1.14
@ -2530,7 +2530,7 @@ default-package-overrides:
- tasty ==1.4.3
- tasty-ant-xml ==1.1.8
- tasty-autocollect ==0.3.2.0
- tasty-bench ==0.3.3
- tasty-bench ==0.3.4
- tasty-dejafu ==2.1.0.0
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3
@ -2649,7 +2649,7 @@ default-package-overrides:
- time-manager ==0.0.0
- time-parsers ==0.1.2.1
- timerep ==2.1.0.0
- timers-tick ==0.5.0.3
- timers-tick ==0.5.0.4
- timer-wheel ==0.4.0.1
- timespan ==0.4.0.0
- time-units ==1.0.0
@ -2732,7 +2732,7 @@ default-package-overrides:
- ulid ==0.3.2.0
- unagi-chan ==0.4.1.4
- unbounded-delays ==0.1.1.1
- unbound-generics ==0.4.2
- unbound-generics ==0.4.3
- unboxed-ref ==0.4.0.0
- unboxing-vector ==0.2.0.0
- uncaught-exception ==0.1.0
@ -2824,7 +2824,7 @@ default-package-overrides:
- vector-bytes-instances ==0.1.1
- vector-circular ==0.1.4
- vector-extras ==0.2.8
- vector-instances ==3.4
- vector-instances ==3.4.2
- vector-mmap ==0.0.3
- vector-rotcev ==0.1.0.2
- vector-sized ==1.5.0
@ -2878,7 +2878,7 @@ default-package-overrides:
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
- wcwidth ==0.0.2
- webby ==1.1.0
- webby ==1.1.1
- webdriver ==0.10.0.1
- webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1

View File

@ -1270,7 +1270,6 @@ dont-distribute-packages:
- distribution-plot
- dixi
- dl-fedora
- dl-fedora_0_9_5
- dmenu-pkill
- dmenu-pmount
- dmenu-search
@ -1284,6 +1283,7 @@ dont-distribute-packages:
- doc-review
- domain
- domain-aeson
- domain-aeson_0_1_1_1
- domain-cereal
- domaindriven
- dormouse-client
@ -3007,6 +3007,7 @@ dont-distribute-packages:
- pandoc-crossref_0_3_15_2
- pandoc-highlighting-extensions
- pandoc-japanese-filters
- pandoc-symreg
- pandora-io
- papa
- papa-base
@ -3247,7 +3248,6 @@ dont-distribute-packages:
- quickcheck-relaxng
- quickcheck-state-machine
- quickcheck-state-machine-distributed
- quickcheck-state-machine_0_7_2
- quicktest
- quipper
- quipper-algorithms

View File

@ -514,7 +514,8 @@ self: super: builtins.intersectAttrs super {
libraryHaskellDepends =
(drv.libraryHaskellDepends or [])
++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64
|| pkgs.stdenv.hostPlatform.isx86_64)) [
|| pkgs.stdenv.hostPlatform.isx86_64)
|| (self.ghc.isGhcjs or false)) [
self.unbounded-delays
];
}) super.tasty;
@ -906,6 +907,9 @@ self: super: builtins.intersectAttrs super {
# Pass the correct libarchive into the package.
streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
# Pass the correct lmdb into the package.
streamly-lmdb = super.streamly-lmdb.override { lmdb = pkgs.lmdb; };
hlint = overrideCabal (drv: {
postInstall = ''
install -Dm644 data/hlint.1 -t "$out/share/man/man1"
@ -1015,14 +1019,6 @@ self: super: builtins.intersectAttrs super {
hnix-store-core = super.hnix-store-core_0_6_1_0;
});
hercules-ci-api-core =
# 2023-05-02: Work around a corrupted file on cache.nixos.org. This is a hash for x86_64-linux. Remove when it has changed.
if super.hercules-ci-api-core.drvPath == "/nix/store/dgy3w43zypmdswc7a7zis0njgljqvnq0-hercules-ci-api-core-0.1.5.0.drv"
then super.hercules-ci-api-core.overrideAttrs (_: {
dummyAttr = 1;
})
else super.hercules-ci-api-core;
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: {
@ -1234,4 +1230,7 @@ self: super: builtins.intersectAttrs super {
keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
# Disable checks to break dependency loop with SCalendar
scalendar = dontCheck super.scalendar;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,7 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
, libsigsegv, gmpxx, cln, yices
# passthru.tests
, tamarin-prover
}:
let
@ -46,6 +48,11 @@ stdenv.mkDerivation {
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
'';
passthru.tests = {
# tamarin-prover only supports specific versions of maude explicitly
inherit tamarin-prover;
};
enableParallelBuilding = true;
meta = {

View File

@ -2,7 +2,7 @@
ghcSrc ? null, ghcVersion ? null
, mkDerivation, base, bytestring, Cabal, containers, directory
, extra, filepath, lib, mtl, parsec, shake, text, transformers
, unordered-containers
, unordered-containers, cryptohash-sha256, base16-bytestring
, userSettings ? null
, writeText
}:
@ -35,6 +35,8 @@ mkDerivation {
executableHaskellDepends = [
base bytestring Cabal containers directory extra filepath mtl
parsec shake text transformers unordered-containers
] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [
cryptohash-sha256 base16-bytestring
];
description = "GHC build system";
license = lib.licenses.bsd3;