on master help sign in
Merge pull request #1528 from bmsherman/cabalUpperBounds2
f50a883Edwin Brady
idris.cabal+40−42
@@ -668,42 +668,40 @@ Library
668 , Version_idris
668 , Version_idris
669
669
670 Build-depends: base >=4 && <5
670 Build-depends: base >=4 && <5
671− , Cabal
672− , annotated-wl-pprint >= 0.5.3
671+ , annotated-wl-pprint >= 0.5.3 && < 0.6
673− , ansi-terminal
672+ , ansi-terminal < 0.7
674− , ansi-wl-pprint
673+ , ansi-wl-pprint < 0.7
675− , base64-bytestring
674+ , base64-bytestring < 1.1
676− , binary
675+ , binary < 0.8
677− , blaze-html >= 0.6.1.3
676+ , blaze-html >= 0.6.1.3 && < 0.8
678 , blaze-markup >= 0.5.2.1 && < 0.7.0.0
677 , blaze-markup >= 0.5.2.1 && < 0.7.0.0
679− , bytestring
678+ , bytestring < 0.11
680− , cheapskate
679+ , cheapskate < 0.2
681− , containers >= 0.5
680+ , containers >= 0.5 && < 0.6
682− , directory
681+ , deepseq < 1.4
683− , directory >= 1.2
682+ , directory >= 1.2 && < 1.3
684− , filepath
683+ , filepath < 1.4
685− , fingertree >= 0.1
684+ , fingertree >= 0.1 && < 0.2
686− , haskeline >= 0.7
685+ , haskeline >= 0.7 && < 0.8
687− , language-java >= 0.2.7
686+ , language-java >= 0.2.7 && < 0.3
688− , lens >= 4.1.1
687+ , lens >= 4.1.1 && < 4.5
689− , mtl
688+ , mtl < 2.3
689+ , network < 2.7
690+ , optparse-applicative >= 0.10 && < 0.11
690 , parsers >= 0.9 && < 0.13
691 , parsers >= 0.9 && < 0.13
691− , pretty
692+ , pretty < 1.2
692− , process
693+ , process < 1.3
693− , split
694+ , split < 0.3
694− , text
695+ , text < 1.3
695− , time >= 1.4
696+ , time >= 1.4 && < 1.6
696− , transformers
697+ , transformers < 0.5
697− , trifecta >= 1.1
698+ , trifecta >= 1.1 && < 1.6
698− , unordered-containers
699+ , unordered-containers < 0.3
699− , utf8-string
700+ , utf8-string < 0.4
700− , vector
701+ , vector < 0.11
701− , vector-binary-instances
702+ , vector-binary-instances < 0.3
702− , network
703− , xml
703+ , xml < 1.4
704− , deepseq
705− , zlib
704+ , zlib < 0.6
706− , optparse-applicative >= 0.10
707 Extensions: MultiParamTypeClasses
705 Extensions: MultiParamTypeClasses
708 , DeriveFoldable
706 , DeriveFoldable
709 , DeriveTraversable
707 , DeriveTraversable
@@ -717,19 +715,19 @@ Library
717
715
718 if os(linux)
716 if os(linux)
719 cpp-options: -DLINUX
717 cpp-options: -DLINUX
720− build-depends: unix
718+ build-depends: unix < 2.8
721 if os(freebsd)
719 if os(freebsd)
722 cpp-options: -DFREEBSD
720 cpp-options: -DFREEBSD
723− build-depends: unix
721+ build-depends: unix < 2.8
724 if os(dragonfly)
722 if os(dragonfly)
725 cpp-options: -DDRAGONFLY
723 cpp-options: -DDRAGONFLY
726− build-depends: unix
724+ build-depends: unix < 2.8
727 if os(darwin)
725 if os(darwin)
728 cpp-options: -DMACOSX
726 cpp-options: -DMACOSX
729− build-depends: unix
727+ build-depends: unix < 2.8
730 if os(windows)
728 if os(windows)
731 cpp-options: -DWINDOWS
729 cpp-options: -DWINDOWS
732− build-depends: Win32
730+ build-depends: Win32 < 2.4
733 if flag(LLVM)
731 if flag(LLVM)
734 other-modules: IRTS.CodegenLLVM
732 other-modules: IRTS.CodegenLLVM
735 cpp-options: -DIDRIS_LLVM
733 cpp-options: -DIDRIS_LLVM
@@ -738,13 +736,13 @@ Library
738 else
736 else
739 other-modules: Util.LLVMStubs
737 other-modules: Util.LLVMStubs
740 if flag(FFI)
738 if flag(FFI)
741− build-depends: libffi
739+ build-depends: libffi < 0.2
742 cpp-options: -DIDRIS_FFI
740 cpp-options: -DIDRIS_FFI
743 if flag(GMP)
741 if flag(GMP)
744− build-depends: libffi
742+ build-depends: libffi < 0.2
745 cpp-options: -DIDRIS_GMP
743 cpp-options: -DIDRIS_GMP
746 if flag(curses)
744 if flag(curses)
747− build-depends: hscurses
745+ build-depends: hscurses < 1.5
748 cpp-options: -DCURSES
746 cpp-options: -DCURSES
749 if flag(freestanding)
747 if flag(freestanding)
750 other-modules: Target_idris
748 other-modules: Target_idris
src/Util/System.hs−1
@@ -2,7 +2,6 @@ module Util.System(tempfile,withTempdir,rmFile,catchIO) where
2
2
3-- System helper functions.
3-- System helper functions.
4import Control.Monad (when)
4import Control.Monad (when)
5−import Distribution.Text (display)
6import System.Directory (getTemporaryDirectory
5import System.Directory (getTemporaryDirectory
7 , removeFile
6 , removeFile
8 , removeDirectoryRecursive
7 , removeDirectoryRecursive