mrkkrp/megaparsec
1
1
Fork 0
mirror of https://github.com/mrkkrp/megaparsec.git synced 2024-11-23 10:23:39 +03:00
Code Issues Projects Releases Wiki Activity

Bump version (8.0.0)

Browse Source 
[skip ci]
This commit is contained in:
mrkkrp 2019-11-07 19:35:27 +01:00
parent 651ce93057
commit 09f92ca177
No known key found for this signature in database
GPG Key ID: 8564658B2889FF7C
4 changed files with 66 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
default.nix
View File

@ -47,6 +47,8 @@ let
'';
}));
doJailbreak = pkgs.haskell.lib.doJailbreak;
megaparsecOverlay = self: super: {
"megaparsec" = doBenchmark
(super.callCabal2nix "megaparsec" megaparsecSource { });
@ -56,21 +58,31 @@ let
# does not contain an executable nor a library, so its install phase
# normally fails. We want to build it and run the tests anyway, so we
# have to do these manipulations.
"parser-combinators-tests" = pkgs.haskell.lib.dontHaddock
"parser-combinators-tests" = doJailbreak (pkgs.haskell.lib.dontHaddock
(patch
(super.parser-combinators-tests.overrideAttrs (drv: {
installPhase = "mkdir $out";
broken = false;
}))
./nix/patches/parser-combinators-tests.patch);
"modern-uri" = doBenchmark super.modern-uri;
"mmark" = doBenchmark (patch super.mmark ./nix/patches/mmark.patch);
"parsers-bench" = doBenchmark
(super.callCabal2nix "parsers-bench" parsersBenchSource { });
"hspec-megaparsec" = patch super.hspec-megaparsec ./nix/patches/hspec-megaparsec.patch;
"dhall" = patch super.dhall ./nix/patches/dhall.patch;
"idris" = patch super.idris ./nix/patches/idris.patch;
"hledger-lib" = patch super.hledger-lib ./nix/patches/hledger-lib.patch;
./nix/patches/parser-combinators-tests.patch));
"modern-uri" = patch (doBenchmark super.modern-uri) ./nix/patches/modern-uri.patch;
"mmark" = doJailbreak (doBenchmark (patch super.mmark ./nix/patches/mmark.patch));
"parsers-bench" = doJailbreak (doBenchmark
(super.callCabal2nix "parsers-bench" parsersBenchSource { }));
"hspec-megaparsec" = doJailbreak
(patch super.hspec-megaparsec ./nix/patches/hspec-megaparsec.patch);
"dhall" = doJailbreak
(patch super.dhall ./nix/patches/dhall.patch);
"idris" = doJailbreak
(patch super.idris ./nix/patches/idris.patch);
"hledger-lib" = doJailbreak
(patch super.hledger-lib ./nix/patches/hledger-lib.patch);
"hledger" = doJailbreak super.hledger;
"cue-sheet" = doJailbreak super.cue-sheet;
"cassava-megaparsec" = doJailbreak super.cassava-megaparsec;
"language-puppet" = doJailbreak super.language-puppet;
"stache" = doJailbreak super.stache;
"tomland" = doJailbreak super.tomland;
};
updatedPkgs = pkgs // {

6
megaparsec-tests/megaparsec-tests.cabal
View File

@ -1,5 +1,5 @@
name: megaparsec-tests
version: 7.0.5
version: 8.0.0
cabal-version: 1.18
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
license: BSD2
@ -28,7 +28,7 @@ library
, hspec >= 2.0 && < 3.0
, hspec-expectations >= 0.8 && < 0.9
, hspec-megaparsec >= 2.0 && < 3.0
, megaparsec == 7.0.5
, megaparsec == 8.0.0
, mtl >= 2.2.2 && < 3.0
, text >= 0.2 && < 1.3
, transformers >= 0.4 && < 0.6
@ -67,7 +67,7 @@ test-suite tests
, hspec >= 2.0 && < 3.0
, hspec-expectations >= 0.8 && < 0.9
, hspec-megaparsec >= 2.0 && < 3.0
, megaparsec == 7.0.5
, megaparsec == 8.0.0
, megaparsec-tests
, mtl >= 2.2.2 && < 3.0
, parser-combinators >= 1.0 && < 2.0

2
megaparsec.cabal
View File

@ -1,5 +1,5 @@
name: megaparsec
version: 7.0.5
version: 8.0.0
cabal-version: 1.18
tested-with: GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
license: BSD2

40
nix/patches/modern-uri.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/modern-uri.cabal b/modern-uri.cabal
index 9397df9..95217fb 100644
--- a/modern-uri.cabal
+++ b/modern-uri.cabal
@@ -32,7 +32,7 @@ library
, contravariant >= 1.3 && < 2.0
, deepseq >= 1.3 && < 1.5
, exceptions >= 0.6 && < 0.11
- , megaparsec >= 7.0 && < 8.0
+ , megaparsec >= 7.0 && < 9.0
, mtl >= 2.0 && < 3.0
, profunctors >= 5.2.1 && < 6.0
, reflection >= 2.0 && < 3.0
@@ -67,7 +67,7 @@ test-suite tests
, bytestring >= 0.2 && < 0.11
, hspec >= 2.0 && < 3.0
, hspec-megaparsec >= 2.0 && < 3.0
- , megaparsec >= 7.0 && < 8.0
+ , megaparsec >= 7.0 && < 9.0
, modern-uri
, text >= 0.2 && < 1.3
build-tools: hspec-discover >= 2.0 && < 3.0
@@ -86,7 +86,7 @@ benchmark bench-speed
build-depends: base >= 4.11 && < 5.0
, bytestring >= 0.2 && < 0.11
, criterion >= 0.6.2.1 && < 1.6
- , megaparsec >= 7.0 && < 8.0
+ , megaparsec >= 7.0 && < 9.0
, modern-uri
, text >= 0.2 && < 1.3
if flag(dev)
@@ -102,7 +102,7 @@ benchmark bench-memory
build-depends: base >= 4.11 && < 5.0
, bytestring >= 0.2 && < 0.11
, deepseq >= 1.3 && < 1.5
- , megaparsec >= 7.0 && < 8.0
+ , megaparsec >= 7.0 && < 9.0
, modern-uri
, text >= 0.2 && < 1.3
, weigh >= 0.0.4