on master help sign in
Merge pull request #1528 from bmsherman/cabalUpperBounds2

Add upper bounds to cabal package dependencies (second try)

commitf50a883d6d3ecf64a0e61955cf0f23d020a61a4c authorEdwin Brady <edwin.brady@gmail.com> dateWed 17 Sep 2014, 08:51 (12 years ago) parent29b4d1a3725081
2 files changed+40−43
idris.cabal+40−42 src/Util/System.hs−1
idris.cabal+40−42
@@ -668,42 +668,40 @@ Library
668668 , Version_idris
669669
670670 Build-depends: base >=4 && <5
671− , Cabal
672− , annotated-wl-pprint >= 0.5.3
673− , ansi-terminal
674− , ansi-wl-pprint
675− , base64-bytestring
676− , binary
677− , blaze-html >= 0.6.1.3
671+ , annotated-wl-pprint >= 0.5.3 && < 0.6
672+ , ansi-terminal < 0.7
673+ , ansi-wl-pprint < 0.7
674+ , base64-bytestring < 1.1
675+ , binary < 0.8
676+ , blaze-html >= 0.6.1.3 && < 0.8
678677 , blaze-markup >= 0.5.2.1 && < 0.7.0.0
679− , bytestring
680− , cheapskate
681− , containers >= 0.5
682− , directory
683− , directory >= 1.2
684− , filepath
685− , fingertree >= 0.1
686− , haskeline >= 0.7
687− , language-java >= 0.2.7
688− , lens >= 4.1.1
689− , mtl
678+ , bytestring < 0.11
679+ , cheapskate < 0.2
680+ , containers >= 0.5 && < 0.6
681+ , deepseq < 1.4
682+ , directory >= 1.2 && < 1.3
683+ , filepath < 1.4
684+ , fingertree >= 0.1 && < 0.2
685+ , haskeline >= 0.7 && < 0.8
686+ , language-java >= 0.2.7 && < 0.3
687+ , lens >= 4.1.1 && < 4.5
688+ , mtl < 2.3
689+ , network < 2.7
690+ , optparse-applicative >= 0.10 && < 0.11
690691 , parsers >= 0.9 && < 0.13
691− , pretty
692− , process
693− , split
694− , text
695− , time >= 1.4
696− , transformers
697− , trifecta >= 1.1
698− , unordered-containers
699− , utf8-string
700− , vector
701− , vector-binary-instances
702− , network
703− , xml
704− , deepseq
705− , zlib
706− , optparse-applicative >= 0.10
692+ , pretty < 1.2
693+ , process < 1.3
694+ , split < 0.3
695+ , text < 1.3
696+ , time >= 1.4 && < 1.6
697+ , transformers < 0.5
698+ , trifecta >= 1.1 && < 1.6
699+ , unordered-containers < 0.3
700+ , utf8-string < 0.4
701+ , vector < 0.11
702+ , vector-binary-instances < 0.3
703+ , xml < 1.4
704+ , zlib < 0.6
707705 Extensions: MultiParamTypeClasses
708706 , DeriveFoldable
709707 , DeriveTraversable
@@ -717,19 +715,19 @@ Library
717715
718716 if os(linux)
719717 cpp-options: -DLINUX
720− build-depends: unix
718+ build-depends: unix < 2.8
721719 if os(freebsd)
722720 cpp-options: -DFREEBSD
723− build-depends: unix
721+ build-depends: unix < 2.8
724722 if os(dragonfly)
725723 cpp-options: -DDRAGONFLY
726− build-depends: unix
724+ build-depends: unix < 2.8
727725 if os(darwin)
728726 cpp-options: -DMACOSX
729− build-depends: unix
727+ build-depends: unix < 2.8
730728 if os(windows)
731729 cpp-options: -DWINDOWS
732− build-depends: Win32
730+ build-depends: Win32 < 2.4
733731 if flag(LLVM)
734732 other-modules: IRTS.CodegenLLVM
735733 cpp-options: -DIDRIS_LLVM
@@ -738,13 +736,13 @@ Library
738736 else
739737 other-modules: Util.LLVMStubs
740738 if flag(FFI)
741− build-depends: libffi
739+ build-depends: libffi < 0.2
742740 cpp-options: -DIDRIS_FFI
743741 if flag(GMP)
744− build-depends: libffi
742+ build-depends: libffi < 0.2
745743 cpp-options: -DIDRIS_GMP
746744 if flag(curses)
747− build-depends: hscurses
745+ build-depends: hscurses < 1.5
748746 cpp-options: -DCURSES
749747 if flag(freestanding)
750748 other-modules: Target_idris
src/Util/System.hs−1
@@ -2,7 +2,6 @@ module Util.System(tempfile,withTempdir,rmFile,catchIO) where
22
33-- System helper functions.
44import Control.Monad (when)
5−import Distribution.Text (display)
65import System.Directory (getTemporaryDirectory
76 , removeFile
87 , removeDirectoryRecursive