about summary refs log tree commit diff
path: root/pkgs/development/libraries/haskell/convertible-text
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-31 20:01:40 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-31 20:01:40 +0000
commit5299c1f6fb7cc9fa5e6dad9107ccab1417179731 (patch)
tree52d7d482e7310407aa3f48dfd757ec13a6ce413d /pkgs/development/libraries/haskell/convertible-text
parent3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 (diff)
parentd789eb6a05b5eb2bd3c46798a1e7babfcffe1413 (diff)
svn merge ^/nixpkgs/trunk backups/glib-2.30-take2@33502
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
Diffstat (limited to 'pkgs/development/libraries/haskell/convertible-text')
-rw-r--r--pkgs/development/libraries/haskell/convertible-text/default.nix17
1 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix
deleted file mode 100644
index 7d8b40654eca5..0000000000000
--- a/pkgs/development/libraries/haskell/convertible-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, attempt, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "convertible-text";
-  version = "0.4.0.2";
-  sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ attempt text time ];
-  meta = {
-    homepage = "http://github.com/snoyberg/convertible/tree/text";
-    description = "Typeclasses and instances for converting between types (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})