[darcs] more mtl state tweaks and separate out deps bumps into darcs-2.5-ghc7-deps.patch again
Jens Petersen
petersen at fedoraproject.org
Sat Nov 27 06:18:58 UTC 2010
commit 0863f95f38fc247310ed9503f00303773a221422
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Nov 27 16:18:59 2010 +1000
more mtl state tweaks and separate out deps bumps into darcs-2.5-ghc7-deps.patch again
darcs-2.5-ghc7-deps.patch | 102 ++++++++++++++++++++++++++++++++++
darcs-2.5-ghc7.patch | 133 ++++++++++-----------------------------------
darcs.spec | 7 ++-
3 files changed, 135 insertions(+), 107 deletions(-)
---
diff --git a/darcs-2.5-ghc7-deps.patch b/darcs-2.5-ghc7-deps.patch
new file mode 100644
index 0000000..6450fc9
--- /dev/null
+++ b/darcs-2.5-ghc7-deps.patch
@@ -0,0 +1,102 @@
+diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
+--- darcs-2.5/darcs.cabal 2010-10-25 01:29:26.000000000 +1000
++++ darcs-2.5-ghc7/darcs.cabal 2010-11-26 19:38:57.000000000 +1000
+@@ -163,19 +163,19 @@
+ build-depends: base < 5,
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+- mtl >= 1.0 && < 1.2,
++ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.1,
+ html == 1.0.*,
+- filepath == 1.1.*,
++ filepath >= 1.1.0.0 && < 1.3.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+ hashed-storage >= 0.5.2 && < 0.6,
+ base >= 3,
+ bytestring >= 0.9.0 && < 0.10,
+ text >= 0.3,
+ old-time == 1.0.*,
+- directory == 1.0.*,
++ directory >= 1.0.0.0 && < 1.2.0.0,
+ process == 1.0.*,
+- containers >= 0.1 && < 0.4,
++ containers >= 0.1 && < 0.5,
+ array >= 0.1 && < 0.4,
+ random == 1.0.*,
+ tar == 0.3.*,
+@@ -365,10 +365,10 @@
+ build-depends: base < 5,
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+- mtl >= 1.0 && < 1.2,
++ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.1,
+ html == 1.0.*,
+- filepath == 1.1.*,
++ filepath >= 1.1.0.0 && < 1.3.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+ hashed-storage >= 0.5.2 && < 0.6,
+ tar == 0.3.*
+@@ -380,9 +380,9 @@
+ bytestring >= 0.9.0 && < 0.10,
+ text >= 0.3,
+ old-time == 1.0.*,
+- directory == 1.0.*,
++ directory >= 1.0.0.0 && < 1.2.0.0,
+ process == 1.0.*,
+- containers >= 0.1 && < 0.4,
++ containers >= 0.1 && < 0.5,
+ array >= 0.1 && < 0.4,
+ random == 1.0.*
+
+@@ -506,10 +506,10 @@
+ build-depends: base < 5,
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+- mtl >= 1.0 && < 1.2,
++ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.1,
+ html == 1.0.*,
+- filepath == 1.1.*,
++ filepath >= 1.1.0.0 && < 1.3.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+ hashed-storage >= 0.5.2 && < 0.6,
+ tar == 0.3.*
+@@ -521,9 +521,9 @@
+ bytestring >= 0.9.0 && < 0.10,
+ text >= 0.3,
+ old-time == 1.0.*,
+- directory == 1.0.*,
++ directory >= 1.0.0.0 && < 1.2.0.0,
+ process == 1.0.*,
+- containers >= 0.1 && < 0.4,
++ containers >= 0.1 && < 0.5,
+ array >= 0.1 && < 0.4,
+ random == 1.0.*
+
+@@ -594,10 +594,10 @@
+ build-depends: base < 5,
+ extensible-exceptions >= 0.1 && < 0.2,
+ regex-compat >= 0.71 && < 0.94,
+- mtl >= 1.0 && < 1.2,
++ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.1,
+ html == 1.0.*,
+- filepath == 1.1.*,
++ filepath >= 1.1.0.0 && < 1.3.0.0,
+ QuickCheck >= 2.1.0.0,
+ HUnit >= 1.0,
+ test-framework >= 0.2.2,
+@@ -659,9 +659,9 @@
+ haskeline >= 0.6.2.2 && < 0.7,
+ text >= 0.3,
+ old-time == 1.0.*,
+- directory == 1.0.*,
++ directory >= 1.0.0.0 && < 1.2.0.0,
+ process == 1.0.*,
+- containers >= 0.1 && < 0.4,
++ containers >= 0.1 && < 0.5,
+ array >= 0.1 && < 0.4,
+ hashed-storage >= 0.5.2 && < 0.6,
+ random == 1.0.*
diff --git a/darcs-2.5-ghc7.patch b/darcs-2.5-ghc7.patch
index 14f1adc..493fa9a 100644
--- a/darcs-2.5-ghc7.patch
+++ b/darcs-2.5-ghc7.patch
@@ -1,105 +1,3 @@
-diff -ur --exclude=_darcs darcs-2.5/darcs.cabal darcs-2.5-ghc7/darcs.cabal
---- darcs-2.5/darcs.cabal 2010-10-25 01:29:26.000000000 +1000
-+++ darcs-2.5-ghc7/darcs.cabal 2010-11-26 19:38:57.000000000 +1000
-@@ -163,19 +163,19 @@
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
-- mtl >= 1.0 && < 1.2,
-+ mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.1,
- html == 1.0.*,
-- filepath == 1.1.*,
-+ filepath >= 1.1.0.0 && < 1.3.0.0,
- haskeline >= 0.6.2.2 && < 0.7,
- hashed-storage >= 0.5.2 && < 0.6,
- base >= 3,
- bytestring >= 0.9.0 && < 0.10,
- text >= 0.3,
- old-time == 1.0.*,
-- directory == 1.0.*,
-+ directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
-- containers >= 0.1 && < 0.4,
-+ containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- random == 1.0.*,
- tar == 0.3.*,
-@@ -365,10 +365,10 @@
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
-- mtl >= 1.0 && < 1.2,
-+ mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.1,
- html == 1.0.*,
-- filepath == 1.1.*,
-+ filepath >= 1.1.0.0 && < 1.3.0.0,
- haskeline >= 0.6.2.2 && < 0.7,
- hashed-storage >= 0.5.2 && < 0.6,
- tar == 0.3.*
-@@ -380,9 +380,9 @@
- bytestring >= 0.9.0 && < 0.10,
- text >= 0.3,
- old-time == 1.0.*,
-- directory == 1.0.*,
-+ directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
-- containers >= 0.1 && < 0.4,
-+ containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- random == 1.0.*
-
-@@ -506,10 +506,10 @@
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
-- mtl >= 1.0 && < 1.2,
-+ mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.1,
- html == 1.0.*,
-- filepath == 1.1.*,
-+ filepath >= 1.1.0.0 && < 1.3.0.0,
- haskeline >= 0.6.2.2 && < 0.7,
- hashed-storage >= 0.5.2 && < 0.6,
- tar == 0.3.*
-@@ -521,9 +521,9 @@
- bytestring >= 0.9.0 && < 0.10,
- text >= 0.3,
- old-time == 1.0.*,
-- directory == 1.0.*,
-+ directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
-- containers >= 0.1 && < 0.4,
-+ containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- random == 1.0.*
-
-@@ -594,10 +594,10 @@
- build-depends: base < 5,
- extensible-exceptions >= 0.1 && < 0.2,
- regex-compat >= 0.71 && < 0.94,
-- mtl >= 1.0 && < 1.2,
-+ mtl >= 1.0 && < 2.1,
- parsec >= 2.0 && < 3.1,
- html == 1.0.*,
-- filepath == 1.1.*,
-+ filepath >= 1.1.0.0 && < 1.3.0.0,
- QuickCheck >= 2.1.0.0,
- HUnit >= 1.0,
- test-framework >= 0.2.2,
-@@ -659,9 +659,9 @@
- haskeline >= 0.6.2.2 && < 0.7,
- text >= 0.3,
- old-time == 1.0.*,
-- directory == 1.0.*,
-+ directory >= 1.0.0.0 && < 1.2.0.0,
- process == 1.0.*,
-- containers >= 0.1 && < 0.4,
-+ containers >= 0.1 && < 0.5,
- array >= 0.1 && < 0.4,
- hashed-storage >= 0.5.2 && < 0.6,
- random == 1.0.*
diff -ur darcs-2.5/src/Darcs/Arguments.lhs darcs-2.5-ghc7-2/src/Darcs/Arguments.lhs
--- darcs-2.5/src/Darcs/Arguments.lhs 2010-10-25 01:29:26.000000000 +1000
+++ darcs-2.5-ghc7-2/src/Darcs/Arguments.lhs 2010-11-26 19:43:45.000000000 +1000
@@ -356,10 +254,19 @@ diff -ur darcs-2.5/src/Darcs/Patch/Apply.lhs darcs-2.5-ghc7-2/src/Darcs/Patch/Ap
f_hunk _ = False
hunkmod :: WriteableDirectory m => FL FilePatchType C(x y)
-> B.ByteString -> m B.ByteString
-diff -ur darcs-2.5/src/Darcs/Patch/Choices.hs darcs-2.5-ghc7-2/src/Darcs/Patch/Choices.hs
+diff -u darcs-2.5/src/Darcs/Patch/Choices.hs darcs-2.5-ghc7-2/src/Darcs/Patch/Choices.hs
--- darcs-2.5/src/Darcs/Patch/Choices.hs 2010-10-25 01:29:26.000000000 +1000
-+++ darcs-2.5-ghc7-2/src/Darcs/Patch/Choices.hs 2010-11-26 19:43:49.000000000 +1000
-@@ -248,6 +248,7 @@
++++ darcs-2.5-ghc7-2/src/Darcs/Patch/Choices.hs 2010-11-27 16:00:40.000000000 +1000
+@@ -62,7 +62,7 @@
+ substitute
+ ) where
+
+-import Control.Monad.State( State(..) )
++import Control.Monad.State( state, State(..) )
+
+ import Darcs.Patch
+ import Darcs.Patch.Permutations ( commuteWhatWeCanRL, commuteWhatWeCanFL )
+@@ -248,12 +248,13 @@
Just (tp' :> bubble') -> psLast firsts (tp' :<: middles) bubble' ls
Nothing -> psLast firsts middles (tp :<: bubble) ls
psLast _ _ _ NilFL = impossible
@@ -367,6 +274,13 @@ diff -ur darcs-2.5/src/Darcs/Patch/Choices.hs darcs-2.5-ghc7-2/src/Darcs/Patch/C
settleM middles = mapFL_FL (\tp -> PC tp False) $ reverseRL middles
settleB bubble = mapFL_FL (\tp -> PC tp True) $ reverseRL bubble
+ patchSlot' :: Patchy p =>
+ TaggedPatch p C(a b) -> State (PatchChoices p C(x y)) Slot
+-patchSlot' = State . patchSlot
++patchSlot' = state . patchSlot
+
+ forceMatchingFirst :: forall p C(a b). Patchy p =>
+ ( FORALL(x y) TaggedPatch p C(x y) -> Bool)
@@ -291,7 +292,8 @@
selectAllMiddles :: forall p C(x y). Patchy p => Bool
-> PatchChoices p C(x y) -> PatchChoices p C(x y)
@@ -475,6 +389,15 @@ diff -ur darcs-2.5/src/Darcs/Repository/DarcsRepo.lhs darcs-2.5-ghc7-2/src/Darcs
diff -ur darcs-2.5/src/Darcs/SelectChanges.hs darcs-2.5-ghc7-2/src/Darcs/SelectChanges.hs
--- darcs-2.5/src/Darcs/SelectChanges.hs 2010-11-26 20:15:55.000000000 +1000
+++ darcs-2.5-ghc7-2/src/Darcs/SelectChanges.hs 2010-11-26 19:43:51.000000000 +1000
+@@ -32,7 +32,7 @@
+ import Control.Monad ( when, (>=>) )
+ import Control.Monad.Trans ( liftIO )
+ import Control.Monad.Reader ( ReaderT, Reader, asks, runReader, runReaderT )
+-import Control.Monad.State ( State(..), StateT, modify, gets, execStateT )
++import Control.Monad.State ( State(..), StateT, modify, gets, execStateT, runState )
+ import System.Exit ( exitWith, ExitCode(ExitSuccess) )
+
+ import English ( Noun(..), englishNum )
@@ -160,10 +160,11 @@
-- | 'iswanted' selects patches according to the @--match@ flag in
diff --git a/darcs.spec b/darcs.spec
index d0be400..6b6ae59 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -48,7 +48,8 @@ BuildRequires: hscolour
# for make check
BuildRequires: which
Patch1: darcs-2.5-ShellHarness-ghc70.patch
-Patch2: darcs-2.5-ghc7.patch
+Patch2: darcs-2.5-ghc7-deps.patch
+Patch3: darcs-2.5-ghc7.patch
%description
%{common_description}
@@ -59,6 +60,7 @@ Patch2: darcs-2.5-ghc7.patch
%setup -q -n %{pkg_name}-%{version}
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
+%patch3 -p1 -b .orig
%build
@@ -96,8 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Nov 26 2010 Jens Petersen <petersen at redhat.com> - 2.5-3
-- add darcs-2.5-ghc7.patch for ghc-7.0.1 (thanks Ganesh Sittampalam)
- add darcs-2.5-ShellHarness-ghc70.patch for abstract directory Permissions
+- add darcs-2.5-ghc7-deps.patch to bump dep versions
+- add darcs-2.5-ghc7.patch for ghc-7.0.1 (thanks Ganesh Sittampalam)
- drop -o obsoletes
* Wed Nov 17 2010 Jens Petersen <petersen at redhat.com> - 2.5-2
More information about the scm-commits
mailing list