From 92f67bccba90f239062e7a9d9ee0c65289827e55 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 17 Nov 2014 09:40:45 +0100
Subject: [PATCH 1/4] add parsek

---
 .../libraries/haskell/parsek/default.nix           | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/parsek/default.nix

diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix
new file mode 100644
index 000000000000..ebde6d7ca409
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parsek/default.nix
@@ -0,0 +1,14 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "parsek";
+  version = "1.0.1";
+  sha256 = "197hjys71f9qgsw83w3wrmijimjzvb9cy4kywkqr95ack8a7pizn";
+  meta = {
+    description = "Parallel Parsing Processes";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9725f2a0bca4..8b8d6daf2e53 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1832,6 +1832,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   parsec = callPackage ../development/libraries/haskell/parsec {};
 
+  parsek = callPackage ../development/libraries/haskell/parsek {};
+
   parsers = callPackage ../development/libraries/haskell/parsers {};
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};

From 98a06ff71f057ffdfb3b5cd2e441b9dad62d01fd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 17 Nov 2014 15:52:00 +0100
Subject: [PATCH 2/4] add myself as maintainer for parsek.

---
 lib/maintainers.nix                                   | 1 +
 pkgs/development/libraries/haskell/parsek/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fe58405eb10e..b919fde0153c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -84,6 +84,7 @@
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
+  jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix
index ebde6d7ca409..6ca9cd719b1f 100644
--- a/pkgs/development/libraries/haskell/parsek/default.nix
+++ b/pkgs/development/libraries/haskell/parsek/default.nix
@@ -8,7 +8,8 @@ cabal.mkDerivation (self: {
   sha256 = "197hjys71f9qgsw83w3wrmijimjzvb9cy4kywkqr95ack8a7pizn";
   meta = {
     description = "Parallel Parsing Processes";
-    license = "GPL";
+    license = self.stdenv.lib.licenses.gpl3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
   };
 })

From c12db21b54824fbc33c84cd4657ac7fe91aa824f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 17 Nov 2014 15:52:40 +0100
Subject: [PATCH 3/4] add myself as maintainer for labeled-tree

---
 pkgs/development/libraries/haskell/labeled-tree/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix
index dd6ea9e7af31..ef0301ef7739 100644
--- a/pkgs/development/libraries/haskell/labeled-tree/default.nix
+++ b/pkgs/development/libraries/haskell/labeled-tree/default.nix
@@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
     description = "Labeled tree structure";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ];
   };
 })

From e6698855a7c8eaf38bfc55dd79811e60aaeda746 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Tue, 18 Nov 2014 08:50:47 +0100
Subject: [PATCH 4/4] haskell-parsek: update to have consistent license

---
 pkgs/development/libraries/haskell/parsek/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix
index 6ca9cd719b1f..45bb96561c33 100644
--- a/pkgs/development/libraries/haskell/parsek/default.nix
+++ b/pkgs/development/libraries/haskell/parsek/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parsek";
-  version = "1.0.1";
-  sha256 = "197hjys71f9qgsw83w3wrmijimjzvb9cy4kywkqr95ack8a7pizn";
+  version = "1.0.1.2";
+  sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd";
   meta = {
     description = "Parallel Parsing Processes";
     license = self.stdenv.lib.licenses.gpl3;