diff --git a/dev-lang/idris/files/idris-1.3.3-remove-git-from-test-configuration.patch b/dev-lang/idris/files/idris-1.3.3-remove-git-from-test-configuration.patch new file mode 100644 index 00000000000..a236f154210 --- /dev/null +++ b/dev-lang/idris/files/idris-1.3.3-remove-git-from-test-configuration.patch @@ -0,0 +1,18 @@ +diff --git a/Setup.hs b/Setup.hs +index d8963d73a..6666a7a77 100644 +--- a/Setup.hs ++++ b/Setup.hs +@@ -117,9 +117,10 @@ idrisClean _ flags _ _ = cleanStdLib + -- Configure + + gitHash :: IO String +-gitHash = do h <- Control.Exception.catch (readProcess "git" ["rev-parse", "--short", "HEAD"] "") +- (\e -> let e' = (e :: SomeException) in return "PRE") +- return $ takeWhile (/= '\n') h ++gitHash = pure "1.1.3" ++-- do h <- Control.Exception.catch (readProcess "git" ["rev-parse", "--short", "HEAD"] "") ++-- (\e -> let e' = (e :: SomeException) in return "PRE") ++-- return $ takeWhile (/= '\n') h + + -- Generate a module that contains extra library directories passed + -- via command-line to cabal diff --git a/dev-lang/idris/idris-1.3.3-r1.ebuild b/dev-lang/idris/idris-1.3.3-r2.ebuild similarity index 88% rename from dev-lang/idris/idris-1.3.3-r1.ebuild rename to dev-lang/idris/idris-1.3.3-r2.ebuild index b4e0047c697..5106a64d2ca 100644 --- a/dev-lang/idris/idris-1.3.3-r1.ebuild +++ b/dev-lang/idris/idris-1.3.3-r2.ebuild @@ -20,7 +20,7 @@ IUSE="ffi gmp" RESTRICT=test # pulls stack -RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] =dev-haskell/aeson-0.6:=[profile?] =dev-haskell/megaparsec-7.0.4:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/network-2.7:=[profile?] =dev-haskell/optparse-applicative-0.13:=[profile?] =dev-haskell/optparse-applicative-0.13:=[profile?] >=dev-haskell/parser-combinators-1.0.0:=[profile?] >=dev-haskell/regex-tdfa-1.2:=[profile?] >=dev-haskell/safe-0.3.9:=[profile?] @@ -57,13 +57,15 @@ RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] = 2.4 && < 3.1' 'Cabal >= 2.4' \ - 'haskeline >= 0.7 && < 0.8' 'haskeline >= 0.8' + 'haskeline >= 0.7 && < 0.8' 'haskeline >= 0.8' \ + 'aeson >= 0.6 && < 1.5' 'aeson >= 0.6' \ + 'optparse-applicative >= 0.13 && < 0.16' 'optparse-applicative >= 0.13' } src_configure() {