diff --git a/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix b/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix deleted file mode 100644 index 0bf489ae9830..000000000000 --- a/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }: - -cabal.mkDerivation (self: { - pname = "hamlet"; - version = "0.8.2.1"; - sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925"; - buildDepends = [ blazeBuilder blazeHtml failure parsec text ]; - meta = { - homepage = "http://www.yesodweb.com/"; - description = "Haml-like template files that are compile-time checked"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix b/pkgs/development/libraries/haskell/hamlet/default.nix similarity index 86% rename from pkgs/development/libraries/haskell/hamlet/0.10.2.nix rename to pkgs/development/libraries/haskell/hamlet/default.nix index 1992be553b23..9f1831a991f2 100644 --- a/pkgs/development/libraries/haskell/hamlet/0.10.2.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.2"; - sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2"; + version = "0.10.3"; + sha256 = "1xkk8hcmfnn9y14fsrab3cv8xknhf8j6hkv668yshg8bjzz1smva"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a09778ae5bb8..e55b471a957c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -648,9 +648,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hakyll = callPackage ../development/libraries/haskell/hakyll {}; - hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {}; - hamlet_0_10_2 = callPackage ../development/libraries/haskell/hamlet/0.10.2.nix {}; - hamlet = self.hamlet_0_10_2; + hamlet = callPackage ../development/libraries/haskell/hamlet {}; happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};