From 2028ece4a8c551050b6a2c92da4bfbf631022654 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Apr 2015 13:38:35 +0200
Subject: [PATCH] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/0342de381c9f9c25900e9aab5a452b484524c96f
 with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd

---
 .../haskell-modules/hackage-packages.nix      | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1f64e841fa6a..0148ca906647 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -45790,8 +45790,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.2.1.2";
-       sha256 = "0lir7xynmq2awgjd163ma16fvpq58dwfkkdjbi4vmcacgyxwxmw9";
+       version = "0.3.0.0";
+       sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3";
        buildDepends = [
          aeson base bytestring network suspend text timers websockets
        ];
@@ -66662,20 +66662,21 @@ self: {
 
   "hruby" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
-     , scientific, stm, text, unordered-containers, vector
+     , ruby, scientific, stm, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.1";
-       sha256 = "137vvqmyq81aqjpag6rl980l2amf0in1rx6im4pp0gzwl48vzsyj";
+       version = "0.3.1.2";
+       sha256 = "1w57k3c4y08mk0887knar33yg36hpk2z31lqwz4aiq3dnidvjmdz";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
+       extraLibraries = [ ruby ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) { inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
@@ -114169,6 +114170,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-upload" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , http-client, http-client-tls, http-types, optparse-applicative
+     , stackage-cli, text
+     }:
+     mkDerivation {
+       pname = "stackage-upload";
+       version = "0.1.0.1";
+       sha256 = "1m2dhj2gsg3f1ykrabgvf61vmlv6dhc013nii4ymn6smacqzihhv";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory filepath http-client
+         http-client-tls http-types optparse-applicative stackage-cli text
+       ];
+       homepage = "https://github.com/fpco/stackage-upload";
+       description = "A more secure version of cabal upload which uses HTTPS";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "standalone-haddock" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , optparse-applicative
@@ -122691,10 +122712,10 @@ self: {
     ({ mkDerivation, base, eventloop }:
      mkDerivation {
        pname = "twentefp-eventloop-trees";
-       version = "0.0.0.1";
-       sha256 = "1zp381z9anqajcwpx6b3yq496a5c44xy98g9qqzq6v79qbhr6rbc";
+       version = "0.1.0.0";
+       sha256 = "18cifjf8avblgf0v1nskxdfx08ph92d16n8c50l9ln99aj9pw724";
        buildDepends = [ base eventloop ];
-       description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
+       description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
      }) {};