diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix deleted file mode 100644 index 4f5841d6881..00000000000 --- a/pkgs/development/libraries/haskell/trifecta/1.1.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml -, blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "trifecta"; - version = "1.1"; - sha256 = "19wnblpn31hvdi5dc8ir24s0hfjj4vvzr43gg9ydl2qdjq6s166w"; - buildDepends = [ - ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup - charset comonad deepseq fingertree hashable lens mtl parsers - reducers semigroups transformers unorderedContainers utf8String - ]; - testDepends = [ doctest filepath ]; - postPatch = '' - substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ - --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," - ''; - meta = { - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.2.nix b/pkgs/development/libraries/haskell/trifecta/1.2.nix deleted file mode 100644 index fae592e73f0..00000000000 --- a/pkgs/development/libraries/haskell/trifecta/1.2.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml -, blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "trifecta"; - version = "1.2.1.1"; - sha256 = "1bv35ip7g0h7r2w0s8pkcbvm0b9hx91vblf5w57q3jr843v9314c"; - buildDepends = [ - ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup - charset comonad deepseq fingertree hashable lens mtl parsers - reducers semigroups transformers unorderedContainers utf8String - ]; - testDepends = [ doctest filepath ]; - postPatch = '' - substituteInPlace trifecta.cabal \ - --replace "blaze-html >= 0.5 && < 0.6," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-html >= 0.5 && < 0.7," "blaze-html >= 0.5 && < 0.8," \ - --replace "blaze-markup >= 0.5 && < 0.6," "blaze-markup >= 0.5 && < 0.7," \ - --replace "hashable >= 1.2.1 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "hashable >= 1.2 && < 1.3," "hashable >= 1.1 && < 1.3," \ - --replace "fingertree >= 0.0.1 && < 0.1," "fingertree >= 0.0.1 && < 0.2," \ - --replace "comonad == 3.*," "comonad >= 3 && < 5," \ - --replace "comonad >= 3 && < 4," "comonad >= 3 && < 5," - ''; - meta = { - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/trifecta/1.4.nix b/pkgs/development/libraries/haskell/trifecta/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/trifecta/1.4.nix rename to pkgs/development/libraries/haskell/trifecta/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ea09d5d7f5d..539564f94c3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2441,12 +2441,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x traverseWithClass = callPackage ../development/libraries/haskell/traverse-with-class {}; - trifecta_1_1 = callPackage ../development/libraries/haskell/trifecta/1.1.nix { - parsers = self.parsers_0_9; - }; - trifecta_1_2 = callPackage ../development/libraries/haskell/trifecta/1.2.nix {}; - trifecta_1_4 = callPackage ../development/libraries/haskell/trifecta/1.4.nix {}; - trifecta = self.trifecta_1_4; + trifecta = callPackage ../development/libraries/haskell/trifecta {}; tuple = callPackage ../development/libraries/haskell/tuple {};