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

Merge pull request #188758 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2022-09-11 11:56:18 +08:00 committed by GitHub
commit 1523c0cd8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 2149 additions and 835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{
"commit": "3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0.tar.gz",
"sha256": "0cd24ibv0i2zq0vvawafm0hqjgv70flmna84g320h5jy3lc0qrv4",
"msg": "Update from Hackage at 2022-08-20T06:29:36Z"
"commit": "0fd2081c5296d9891054f8c742545d3871d76485",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fd2081c5296d9891054f8c742545d3871d76485.tar.gz",
"sha256": "1bxxlks9bjf9lmshlg8777j6h7gb5mpd9lxj97nkqh32gnlj8m38",
"msg": "Update from Hackage at 2022-08-28T23:15:42Z"
}

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

@ -99,7 +99,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "0p9qd7yasdji5kwxn4d0hrv9hnxbzfsczknldh8jav3ynhg8k6c9";
sha256 = "19n60rx4mpr52551mvm0i5kgy32099rvgnihvmh5np09n2f81c2r";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
@ -820,9 +820,9 @@ self: super: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override {
hspec = self.hspec_2_10_0_1;
hspec = self.hspec_2_10_1;
hspec-wai = super.hspec-wai.override {
hspec = self.hspec_2_10_0_1;
hspec = self.hspec_2_10_1;
};
});
@ -1223,9 +1223,18 @@ self: super: {
# The test suite depends on an impure cabal-install installation in
# $HOME, which we don't have in our build sandbox.
cabal-install-parsers = dontCheck (super.cabal-install-parsers.override {
Cabal = self.Cabal_3_6_3_0;
});
# 2022-08-31: Jailbreak is done to allow aeson 2.0.*:
# https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900
cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
}));
cabal-install-parsers_0_4_5 = doDistribute (
dontCheck (
super.cabal-install-parsers_0_4_5.override {
Cabal = self.Cabal_3_6_3_0;
}
)
);
# 2022-03-12: Pick patches from master for compat with Stackage Nightly
gitit = appendPatches [
@ -1633,14 +1642,14 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_0_1 = doDistribute (super.hspec_2_10_0_1.override {
hspec-discover = self.hspec-discover_2_10_0_1;
hspec-core = self.hspec-core_2_10_0_1;
hspec_2_10_1 = doDistribute (super.hspec_2_10_1.override {
hspec-discover = self.hspec-discover_2_10_1;
hspec-core = self.hspec-core_2_10_1;
});
hspec-discover_2_10_0_1 = super.hspec-discover_2_10_0_1.override {
hspec-discover_2_10_1 = super.hspec-discover_2_10_1.override {
hspec-meta = self.hspec-meta_2_9_3;
};
hspec-core_2_10_0_1 = super.hspec-core_2_10_0_1.override {
hspec-core_2_10_1 = super.hspec-core_2_10_1.override {
hspec-meta = self.hspec-meta_2_9_3;
};
@ -2022,19 +2031,9 @@ self: super: {
haskell-ci = super.haskell-ci.overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
ShellCheck = self.ShellCheck_0_7_2;
cabal-install-parsers = self.cabal-install-parsers_0_4_5;
});
# Build haskell-ci from git repository
haskell-ci-unstable = overrideSrc rec {
version = "0.14.1-${builtins.substring 0 7 src.rev}";
src = pkgs.fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
rev = "8311a999b8e8be3aa31f65f314def256aa2d5535";
sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav";
};
} self.haskell-ci;
large-hashable = lib.pipe (super.large-hashable.override {
# https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c
utf8-light = null;
@ -2186,7 +2185,19 @@ self: super: {
# Fixes https://github.com/NixOS/nixpkgs/issues/140613
# https://github.com/recursion-schemes/recursion-schemes/issues/128
recursion-schemes = appendPatch ./patches/recursion-schemes-128.patch super.recursion-schemes;
recursion-schemes = overrideCabal (drv: {
patches = drv.patches or [] ++ [
./patches/recursion-schemes-128.patch
];
# make sure line endings don't break the patch
prePatch = drv.prePatch or "" + ''
"${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
'';
}) super.recursion-schemes;
# 2022-08-30 Too strict bounds on finite-typelits
# https://github.com/jumper149/blucontrol/issues/1
blucontrol = doJailbreak super.blucontrol;
# Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release
# Can't use fetchpatch as it required tweaking the line endings as the .cabal
@ -2544,6 +2555,10 @@ self: super: {
testTarget = "regex-tdfa-unittest";
} super.regex-tdfa;
# 2022-09-01:
# Restrictive upper bound on base.
# Remove once version 1.* is released
monad-bayes = doJailbreak super.monad-bayes;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse
# dependencies to avoid version mismatches in their dependency closure.

3
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -93,7 +93,8 @@ self: super: {
time-compat = doJailbreak super.time-compat;
http-media = unmarkBroken (doJailbreak super.http-media);
servant-server = unmarkBroken (doJailbreak super.servant-server);
foundation = dontCheck super.foundation;
basement = doDistribute self.basement_0_0_14;
foundation = doDistribute (dontCheck self.foundation_0_0_28);
vault = dontHaddock super.vault;
# https://github.com/snapframework/snap-core/issues/288

20
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -87,7 +87,7 @@ self: super: {
constraints = doJailbreak super.constraints;
cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
data-fix = doJailbreak super.data-fix;
dbus = self.dbus_1_2_25;
dbus = self.dbus_1_2_26;
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
ghc-byteorder = doJailbreak super.ghc-byteorder;
@ -130,13 +130,27 @@ self: super: {
retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
singleton-bool = doJailbreak super.singleton-bool;
servant = doJailbreak super.servant;
servant-auth = doJailbreak super.servant-auth;
servant-swagger = doJailbreak super.servant-swagger;
# 2022-09-02: Too strict bounds on lens
# https://github.com/haskell-servant/servant/pull/1607/files
servant-docs = doJailbreak super.servant-docs;
servant-foreign = doJailbreak super.servant-foreign;
servant-auth = doJailbreak super.servant-auth;
servant-auth-docs = doJailbreak super.servant-auth-docs;
servant-auth-server = doJailbreak super.servant-auth-server;
servant-auth-swagger = doJailbreak super.servant-auth-swagger;
# 2022-09-02: Too strict bounds on lens
# https://github.com/haskell-servant/servant-multipart/pull/64
servant-multipart = doJailbreak super.servant-multipart;
# 2022-09-02: Too strict bounds on lens
# https://github.com/GetShopTV/swagger2/pull/242
swagger2 = doJailbreak super.swagger2;
shelly = doJailbreak super.shelly;
splitmix = doJailbreak super.splitmix;
tasty-hspec = doJailbreak super.tasty-hspec;
th-desugar = self.th-desugar_1_13_1;
th-desugar = self.th-desugar_1_14;
time-compat = doJailbreak super.time-compat;
tomland = doJailbreak super.tomland;
type-equality = doJailbreak super.type-equality;

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

@ -70,6 +70,7 @@ broken-packages:
- aeson-bson
- aeson-decode
- aeson-default
- aeson-dependent-sum
- aeson-deriving
- aeson-diff-generic
- aeson-filthy
@ -1144,6 +1145,7 @@ broken-packages:
- djinn-th
- dmcc
- dmenu
- dns-patterns
- dnsrbl
- dnssd
- dobutok
@ -1344,7 +1346,6 @@ broken-packages:
- etcd
- ethereum-rlp
- eurofxref
- evdev
- eve
- eved
- event
@ -2144,7 +2145,6 @@ broken-packages:
- heterogeneous-list-literals
- hetris
- heukarya
- hevm
- HExcel
- hexchat
- hexif
@ -2421,6 +2421,7 @@ broken-packages:
- hsns
- hsntp
- hs-openmoji-data
- hs-opentelemetry-instrumentation-hspec
- hsoptions
- hsoz
- hsparql
@ -2809,7 +2810,6 @@ broken-packages:
- kd-tree
- keccak
- keera-hails-reactivevalues
- keid-render-basic
- keid-ui-dearimgui
- keiretsu
- kempe
@ -3273,7 +3273,6 @@ broken-packages:
- monadacme
- monad-atom
- monad-atom-simple
- monad-bayes
- monad-branch
- MonadCatchIO-transformers
- monad-choice
@ -4069,6 +4068,7 @@ broken-packages:
- proxy-mapping
- psc-ide
- pseudo-trie
- psx
- PTQ
- publicsuffix
- publicsuffixlistcreate
@ -5068,6 +5068,7 @@ broken-packages:
- text-ascii
- text-builder-linear
- text-containers
- text-display
- text-format-heavy
- text-generic-pretty
- text-icu-normalized
@ -5198,6 +5199,7 @@ broken-packages:
- tracetree
- tracked-files
- tracker
- trackit
- traction
- tracy
- traildb

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

@ -150,6 +150,9 @@ extra-packages:
- weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7
- weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
- basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10
- foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
package-maintainers:
abbradar:
@ -535,6 +538,8 @@ supported-platforms:
dx9base: [ platforms.windows ]
dx9d3d: [ platforms.windows ]
dx9d3dx: [ platforms.windows ]
evdev: [ platforms.linux ]
evdev-streamly: [ platforms.linux ]
geomancy: [ platforms.x86 ] # x86 intrinsics
gi-gtkosxapplication: [ platforms.darwin ]
gtk-mac-integration: [ platforms.darwin ]

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

@ -1,4 +1,4 @@
# Stackage LTS 19.19
# Stackage LTS 19.20
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -13,11 +13,11 @@ default-package-overrides:
- active ==0.2.0.15
- ad ==4.5.2
- ad-delcont ==0.3.0.0
- adjunctions ==4.4.1
- adjunctions ==4.4.2
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.1
- aern2-mp ==0.2.9.1
- aern2-real ==0.2.9.1
- aern2-mp ==0.2.10.0
- aern2-real ==0.2.10.0
- aeson ==2.0.3.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.1
@ -140,7 +140,7 @@ default-package-overrides:
- base64-string ==0.2
- base-compat ==0.11.2
- base-compat-batteries ==0.11.2
- basement ==0.0.14
- basement ==0.0.15
- base-orphans ==0.8.7
- base-prelude ==1.6.1
- base-unicode-symbols ==0.2.4.2
@ -315,7 +315,7 @@ default-package-overrides:
- charset ==0.3.9
- charsetdetect-ae ==1.1.0.4
- Chart ==1.9.4
- ChasingBottoms ==1.3.1.11
- ChasingBottoms ==1.3.1.12
- cheapskate ==0.1.1.2
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
@ -429,7 +429,7 @@ default-package-overrides:
- convertible ==1.1.1.1
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.4.0
- core-data ==0.3.6.0
- core-program ==0.4.6.4
- core-text ==0.3.8.0
- countable ==1.0
@ -604,7 +604,7 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-extract ==0.1
- doctest-lib ==0.1
- doctest-parallel ==0.2.4
- doctest-parallel ==0.2.5
- doldol ==0.4.1.2
- do-list ==1.0.1
- domain ==0.1.1.3
@ -624,7 +624,7 @@ default-package-overrides:
- drifter-sqlite ==0.1.0.0
- dsp ==0.2.5.1
- dual ==0.1.1.1
- dual-tree ==0.2.3.0
- dual-tree ==0.2.3.1
- dublincore-xml-conduit ==0.1.0.2
- dunai ==0.8.3
- duration ==0.2.0.0
@ -683,7 +683,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.12
- esqueleto ==3.5.6.1
- esqueleto ==3.5.7.0
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
- essence-of-live-coding-pulse ==0.2.6
@ -725,7 +725,7 @@ default-package-overrides:
- fakedata-quickcheck ==0.2.0
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
- faktory ==1.1.2.2
- faktory ==1.1.2.3
- fast-builder ==0.1.3.0
- fast-logger ==3.1.1
- fast-math ==1.0.2
@ -754,7 +754,7 @@ default-package-overrides:
- fin ==0.2.1
- FindBin ==0.0.5
- fingertree ==0.1.5.0
- finite-typelits ==0.1.4.2
- finite-typelits ==0.1.6.0
- first-class-families ==0.8.0.1
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.10
@ -793,7 +793,7 @@ default-package-overrides:
- format-numbers ==0.1.0.1
- formatting ==7.1.3
- fortran-src ==0.9.0
- foundation ==0.0.28
- foundation ==0.0.29
- fourmolu ==0.4.0.0
- Frames ==0.7.3
- free ==5.1.9
@ -946,7 +946,7 @@ default-package-overrides:
- graph-core ==0.3.0.0
- graphite ==0.10.0.1
- graphs ==0.7.2
- graphula ==2.0.1.1
- graphula ==2.0.2.1
- graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0
- gravatar ==0.8.1
@ -1122,7 +1122,7 @@ default-package-overrides:
- hslua-core ==2.1.0
- hslua-marshalling ==2.1.0
- hslua-module-doclayout ==1.0.4
- hslua-module-path ==1.0.2
- hslua-module-path ==1.0.3
- hslua-module-system ==1.0.2
- hslua-module-text ==1.0.2
- hslua-module-version ==1.0.2
@ -1299,7 +1299,7 @@ default-package-overrides:
- io-memoize ==1.1.1.0
- io-region ==0.1.1
- io-storage ==0.3
- io-streams ==1.5.2.1
- io-streams ==1.5.2.2
- ip6addr ==1.0.3
- iproute ==1.7.12
- IPv6Addr ==2.0.5
@ -1480,7 +1480,7 @@ default-package-overrides:
- markdown ==0.1.17.5
- markdown-unlit ==0.5.1
- markov-chain ==0.0.3.4
- massiv ==1.0.1.1
- massiv ==1.0.2.0
- massiv-io ==1.0.0.1
- massiv-persist ==1.0.0.3
- massiv-serialise ==1.0.0.2
@ -1624,7 +1624,7 @@ default-package-overrides:
- nano-erl ==0.1.0.1
- NanoID ==3.2.1
- nanospec ==0.2.2
- nanovg ==0.8.0.0
- nanovg ==0.8.1.0
- nats ==1.1.2
- natural-arithmetic ==0.1.3.0
- natural-induction ==0.2.0.0
@ -1953,7 +1953,7 @@ default-package-overrides:
- pulse-simple ==0.1.14
- pureMD5 ==2.1.4
- purescript-bridge ==0.14.0.0
- pusher-http-haskell ==2.1.0.10
- pusher-http-haskell ==2.1.0.11
- pvar ==1.0.0.0
- PyF ==0.10.2.0
- qchas ==1.1.0.1
@ -2343,7 +2343,7 @@ default-package-overrides:
- Stream ==0.4.7.2
- streaming ==0.2.3.1
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.2
- streaming-bytestring ==0.2.3
- streaming-cassava ==0.2.0.0
- streaming-commons ==0.2.2.4
- streamly ==0.8.1.1
@ -2598,7 +2598,7 @@ default-package-overrides:
- type-spec ==0.4.0.0
- typography-geometry ==1.0.1.0
- tz ==0.1.3.6
- tzdata ==0.2.20220810.0
- tzdata ==0.2.20220815.0
- ua-parser ==0.7.7.0
- uglymemo ==0.1.0.1
- unagi-chan ==0.4.1.4
@ -2840,7 +2840,7 @@ with-compiler: ghc-9.0.2
- yesod-auth ==1.6.11
- yesod-auth-basic ==0.1.0.3
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.7.0.1
- yesod-auth-oauth2 ==0.7.0.2
- yesod-bin ==1.6.2.1
- yesod-core ==1.6.24.0
- yesod-eventsource ==1.6.0.1

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

@ -1332,7 +1332,6 @@ dont-distribute-packages:
- ethereum-client-haskell
- ethereum-merkle-patricia-db
- euphoria
- evdev-streamly
- eve-cli
- event-monad
- eventful-dynamodb
@ -2184,6 +2183,7 @@ dont-distribute-packages:
- hsx-jmacro
- hsx-xhtml
- html-kure
- html-parse-util
- htoml-parse
- hts
- htsn-import

14
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -738,8 +738,10 @@ self: super: builtins.intersectAttrs super {
'';
}) super.haskell-language-server;
# NOTE: this patch updates the hevm code to work with the latest packages that broke the build
# it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm);
# hadolint enables static linking by default in the cabal file, so we have to explicitly disable it.
# https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b
@ -980,6 +982,14 @@ self: super: builtins.intersectAttrs super {
'';
}) super.jacinda;
# Smoke test can't be executed in sandbox
# https://github.com/georgefst/evdev/issues/25
evdev = overrideCabal (drv: {
testFlags = drv.testFlags or [] ++ [
"-p" "!/Smoke/"
];
}) super.evdev;
# Tests assume dist-newstyle build directory is present
cabal-hoogle = dontCheck super.cabal-hoogle;
@ -1026,6 +1036,8 @@ self: super: builtins.intersectAttrs super {
broken = false;
}) super.cabal-install;
keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
# haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
} // pkgs.lib.mapAttrs
(_: overrideCabal (drv: {

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

File diff suppressed because it is too large Load Diff

129
pkgs/development/haskell-modules/patches/hevm-update-deps.patch Normal file
View File

@ -0,0 +1,129 @@
diff --git a/hevm.cabal b/hevm.cabal
index cf36961e..3b31f595 100644
--- a/hevm.cabal
+++ b/hevm.cabal
@@ -71,6 +71,10 @@ library
-Wall -Wno-deprecations
extra-libraries:
secp256k1, ff
+ if os(darwin)
+ extra-libraries: c++
+ else
+ extra-libraries: stdc++
c-sources:
ethjet/tinykeccak.c, ethjet/ethjet.c
cxx-sources:
@@ -88,7 +92,7 @@ library
transformers >= 0.5.6 && < 0.6,
tree-view >= 0.5 && < 0.6,
abstract-par >= 0.3.3 && < 0.4,
- aeson >= 1.5.6 && < 1.6,
+ aeson >= 2.0 && < 2.1,
bytestring >= 0.10.8 && < 0.11,
scientific >= 0.3.6 && < 0.4,
binary >= 0.8.6 && < 0.9,
@@ -97,7 +101,7 @@ library
vector >= 0.12.1 && < 0.13,
ansi-wl-pprint >= 0.6.9 && < 0.7,
base16-bytestring >= 1.0.0 && < 2.0,
- brick >= 0.58 && < 0.63,
+ brick >= 0.58 && < 0.69,
megaparsec >= 9.0.0 && < 10.0,
mtl >= 2.2.2 && < 2.3,
directory >= 1.3.3 && < 1.4,
@@ -105,13 +109,13 @@ library
vty >= 5.25.1 && < 5.34,
cereal >= 0.5.8 && < 0.6,
cryptonite >= 0.27 && <= 0.29,
- memory >= 0.14.18 && < 0.16,
+ memory >= 0.14.18 && < 0.20,
data-dword >= 0.3.1 && < 0.4,
fgl >= 5.7.0 && < 5.8,
free >= 5.1.3 && < 5.2,
haskeline >= 0.8.0 && < 0.9,
process >= 1.6.5 && < 1.7,
- lens >= 4.17.1 && < 4.20,
+ lens >= 4.17.1 && < 5.1,
lens-aeson >= 1.0.2 && < 1.2,
monad-par >= 0.3.5 && < 0.4,
multiset >= 0.3.4 && < 0.4,
@@ -124,7 +128,6 @@ library
sbv >= 8.9,
semver-range >= 0.2.7 && < 0.3,
temporary >= 1.3 && < 1.4,
- text-format >= 0.3.2 && < 0.4,
witherable >= 0.3.5 && < 0.5,
wreq >= 0.5.3 && < 0.6,
regex-tdfa >= 1.2.3 && < 1.4,
@@ -190,7 +193,6 @@ executable hevm
sbv,
temporary,
text,
- text-format,
unordered-containers,
vector,
vty
diff --git a/src/EVM/Solidity.hs b/src/EVM/Solidity.hs
index b7d0f36b..4e9d6892 100644
--- a/src/EVM/Solidity.hs
+++ b/src/EVM/Solidity.hs
@@ -70,6 +70,7 @@ import Control.Monad
import Control.Lens hiding (Indexed, (.=))
import qualified Data.String.Here as Here
import Data.Aeson hiding (json)
+import qualified Data.Aeson.KeyMap as KeyMap
import Data.Aeson.Types
import Data.Aeson.Lens
import Data.Scientific
@@ -714,8 +715,8 @@ astIdMap = foldMap f
f :: Value -> Map Int Value
f (Array x) = foldMap f x
f v@(Object x) =
- let t = foldMap f (HMap.elems x)
- in case HMap.lookup "id" x of
+ let t = foldMap f (KeyMap.elems x)
+ in case KeyMap.lookup "id" x of
Nothing -> t
Just (Number i) -> t <> Map.singleton (round i) v
Just _ -> t
diff --git a/src/EVM/SymExec.hs b/src/EVM/SymExec.hs
index 5bbf1c03..b828098e 100644
--- a/src/EVM/SymExec.hs
+++ b/src/EVM/SymExec.hs
@@ -40,8 +40,8 @@ type EquivalenceResult = ProofResult ([VM], [VM]) VM ()
-- | Convenience functions for generating large symbolic byte strings
sbytes32, sbytes128, sbytes256, sbytes512, sbytes1024 :: Query ([SWord 8])
-sbytes32 = toBytes <$> freshVar_ @ (WordN 256)
-sbytes128 = toBytes <$> freshVar_ @ (WordN 1024)
+sbytes32 = toBytes <$> freshVar_ @(WordN 256)
+sbytes128 = toBytes <$> freshVar_ @(WordN 1024)
sbytes256 = liftA2 (++) sbytes128 sbytes128
sbytes512 = liftA2 (++) sbytes256 sbytes256
sbytes1024 = liftA2 (++) sbytes512 sbytes512
diff --git a/src/EVM/Types.hs b/src/EVM/Types.hs
index fdd2368d..1dc29e83 100644
--- a/src/EVM/Types.hs
+++ b/src/EVM/Types.hs
@@ -434,17 +434,17 @@ readN s = fromIntegral (read s :: Integer)
readNull :: Read a => a -> String -> a
readNull x = fromMaybe x . Text.Read.readMaybe
-wordField :: JSON.Object -> Text -> JSON.Parser W256
+wordField :: JSON.Object -> Key -> JSON.Parser W256
wordField x f = ((readNull 0) . Text.unpack)
<$> (x .: f)
-addrField :: JSON.Object -> Text -> JSON.Parser Addr
+addrField :: JSON.Object -> Key -> JSON.Parser Addr
addrField x f = (read . Text.unpack) <$> (x .: f)
-addrFieldMaybe :: JSON.Object -> Text -> JSON.Parser (Maybe Addr)
+addrFieldMaybe :: JSON.Object -> Key -> JSON.Parser (Maybe Addr)
addrFieldMaybe x f = (Text.Read.readMaybe . Text.unpack) <$> (x .: f)
-dataField :: JSON.Object -> Text -> JSON.Parser ByteString
+dataField :: JSON.Object -> Key -> JSON.Parser ByteString
dataField x f = hexText <$> (x .: f)
toWord512 :: W256 -> Word512

13
pkgs/tools/security/echidna/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, fetchpatch
, fetchFromGitHub
# Haskell deps
, mkDerivation, aeson, ansi-terminal, base, base16-bytestring, binary, brick
@ -8,19 +7,24 @@
, MonadRandom, mtl, optparse-applicative, process, random, stm, tasty
, tasty-hunit, tasty-quickcheck, temporary, text, transformers , unix, unliftio
, unliftio-core, unordered-containers, vector, vector-instances, vty
, wl-pprint-annotated, word8, yaml , extra, ListLike, semver
, wl-pprint-annotated, word8, yaml, extra, ListLike, semver
}:
mkDerivation rec {
pname = "echidna";
version = "1.7.3";
version = "2.0.2";
src = fetchFromGitHub {
owner = "crytic";
repo = "echidna";
rev = "v${version}";
sha256 = "sha256-NkAAXYa1bbCNUO0eDM7LQbyC3//RRFAKmEHGH2Dhl/M=";
sha256 = "sha256-WmlQWgn4qfRmx3PdzY7wzT9AyU7Re2T1CWJ7yGjcVac=";
};
# NOTE: echidna is behind with aeson because of hevm, this patch updates
# the code to work with the major aeson update that broke the build
# it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1
patches = [ ./echidna-update-aeson.patch ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@ -51,4 +55,5 @@ mkDerivation rec {
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ arturcygan ];
platforms = lib.platforms.unix;
mainProgram = "echidna-test";
}

38
pkgs/tools/security/echidna/echidna-update-aeson.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/lib/Echidna/Config.hs b/lib/Echidna/Config.hs
index f8d5777..3d761fe 100644
--- a/lib/Echidna/Config.hs
+++ b/lib/Echidna/Config.hs
@@ -13,8 +13,8 @@ import Control.Monad.State (StateT(..), runStateT)
import Control.Monad.Trans (lift)
import Data.Bool (bool)
import Data.Aeson
+import Data.Aeson.KeyMap (keys)
import Data.Has (Has(..))
-import Data.HashMap.Strict (keys)
import Data.HashSet (fromList, insert, difference)
import Data.Maybe (fromMaybe)
import Data.Text (isPrefixOf)
@@ -23,11 +23,13 @@ import EVM.Types (w256)
import qualified Control.Monad.Fail as M (MonadFail(..))
import qualified Data.ByteString as BS
+import qualified Data.Aeson.Key as Key
+import qualified Data.HashSet as HS
import qualified Data.List.NonEmpty as NE
import qualified Data.Yaml as Y
import Echidna.Test
-import Echidna.Types.Campaign
+import Echidna.Types.Campaign
import Echidna.Mutator.Corpus (defaultMutationConsts)
import Echidna.Types.Config (EConfigWithUsage(..), EConfig(..))
import Echidna.Types.Solidity
@@ -52,7 +54,7 @@ instance FromJSON EConfigWithUsage where
_ -> mempty
(c, ks) <- runStateT (parser v') $ fromList []
let found = fromList (keys v')
- return $ EConfigWithUsage c (found `difference` ks) (ks `difference` found)
+ return $ EConfigWithUsage c (HS.map Key.toText $ found `difference` ks) (HS.map Key.toText $ ks `difference` found)
-- this parser runs in StateT and comes equipped with the following
-- equivalent unary operators:
-- x .:? k (Parser) <==> x ..:? k (StateT)

1
pkgs/top-level/all-packages.nix
View File

@ -16741,7 +16741,6 @@ with pkgs;
msitools = callPackage ../development/tools/misc/msitools { };
haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci;
haskell-ci-unstable = lowPrio (haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci-unstable);
neoload = callPackage ../development/tools/neoload {
licenseAccepted = (config.neoload.accept_license or false);