diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-05-20 01:39:43 +0200 |
| commit | 1849de11ec1e32e9eebb83f24d5339bea88b7ed7 (patch) | |
| tree | 0aaf3cead09c2d55c67c6f6a86ad20af399797d8 /nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch | |
| parent | 304c06d7a7ea3f5c84031d325ece8d38b8c1d829 (diff) | |
| parent | 0f5ce2fac0c726036ca69a5524c59a49e2973dd4 (diff) | |
Merge commit '0f5ce2fac0c726036ca69a5524c59a49e2973dd4'
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch b/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch deleted file mode 100644 index 100a828a501..00000000000 --- a/nixpkgs/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur proto-lens-0.2.2.0/proto-lens.cabal proto-lens-0.2.2.0-patched/proto-lens.cabal ---- proto-lens-0.2.2.0/proto-lens.cabal 2018-08-13 18:05:41.704823370 +0200 -+++ proto-lens-0.2.2.0-patched/proto-lens.cabal 2018-08-13 18:07:42.352372300 +0200 -@@ -33,7 +33,7 @@ - Data.ProtoLens.Encoding.Wire - Data.ProtoLens.TextFormat.Parser - build-depends: attoparsec == 0.13.* -- , base >= 4.8 && < 4.11 -+ , base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -diff -Naur proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs ---- proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs 2017-04-28 02:16:46.000000000 +0200 -+++ proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs 2018-08-13 18:08:06.371486594 +0200 -@@ -17,6 +17,7 @@ - readMessageOrDie, - ) where - -+import Prelude hiding ((<>)) - import Lens.Family2 ((&),(^.),(.~), set, over) - import Control.Arrow (left) - import qualified Data.ByteString |