diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index df57364fa08..48682210be1 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -11,10 +11,11 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14"; - sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; + version = "0.9.14.1"; + sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; isLibrary = true; isExecutable = true; + jailbreak = true; buildDepends = [ annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree @@ -26,7 +27,6 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; - patches = [ ./trifecta-fix.patch ]; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/idris/trifecta-fix.patch b/pkgs/development/compilers/idris/trifecta-fix.patch deleted file mode 100644 index a20e482d2c4..00000000000 --- a/pkgs/development/compilers/idris/trifecta-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Idris/AbsSyntaxTree.hs b/src/Idris/AbsSyntaxTree.hs -index 76df969..076f1ff 100644 ---- a/src/Idris/AbsSyntaxTree.hs -+++ b/src/Idris/AbsSyntaxTree.hs -@@ -194,6 +194,10 @@ data IState = IState { - idris_callswho :: Maybe (M.Map Name [Name]) - } - -+-- Required for parsers library, and therefore trifecta -+instance Show IState where -+ show = const "{internal state}" -+ - data SizeChange = Smaller | Same | Bigger | Unknown - deriving (Show, Eq) - {-! diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3fb2cf83484..6a995a6dd59 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2875,10 +2875,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { - parsers = self.parsers_0_10_3; - trifecta = self.trifecta.override { - parsers = self.parsers_0_10_3; - }; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; };