From df6827a82495c4f7f9219569a52ae3c175728111 Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Sat, 5 Sep 2015 20:59:38 -0700
Subject: [PATCH] taskjuggler: add 3.5.0, keep 2.4.3

Version 3.5.0 was present but was removed in 8085f08.  Keeping the old version
per discussion at https://github.com/NixOS/nixpkgs/pull/845.
---
 .../misc/taskjuggler/{ => 2.x}/default.nix    |  0
 .../{ => 2.x}/timezone-glibc.patch            |  0
 .../applications/misc/taskjuggler/3.x/Gemfile |  2 +
 .../misc/taskjuggler/3.x/Gemfile.lock         | 21 +++++++++
 .../misc/taskjuggler/3.x/default.nix          | 17 +++++++
 .../misc/taskjuggler/3.x/gemset.nix           | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++-
 7 files changed, 92 insertions(+), 1 deletion(-)
 rename pkgs/applications/misc/taskjuggler/{ => 2.x}/default.nix (100%)
 rename pkgs/applications/misc/taskjuggler/{ => 2.x}/timezone-glibc.patch (100%)
 create mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile
 create mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
 create mode 100644 pkgs/applications/misc/taskjuggler/3.x/default.nix
 create mode 100644 pkgs/applications/misc/taskjuggler/3.x/gemset.nix

diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/default.nix
rename to pkgs/applications/misc/taskjuggler/2.x/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/timezone-glibc.patch
rename to pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/3.x/Gemfile
new file mode 100644
index 00000000000..77cbaeeed79
--- /dev/null
+++ b/pkgs/applications/misc/taskjuggler/3.x/Gemfile
@@ -0,0 +1,2 @@
+source 'http://rubygems.org'
+gem 'taskjuggler'
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
new file mode 100644
index 00000000000..d1642e76fa6
--- /dev/null
+++ b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
@@ -0,0 +1,21 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.6.1)
+    taskjuggler (3.5.0)
+      mail (>= 2.4.3)
+      term-ansicolor (>= 1.0.7)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    tins (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  taskjuggler
+
+BUNDLED WITH
+   1.10.5
diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix
new file mode 100644
index 00000000000..eaca537356b
--- /dev/null
+++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "taskjuggler-3.5.0";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = {
+    description = "A modern and powerful project management tool";
+    homepage    = http://taskjuggler.org/;
+    license     = lib.licenses.gpl2;
+    platforms   = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
new file mode 100644
index 00000000000..e65ab3451a6
--- /dev/null
+++ b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
@@ -0,0 +1,47 @@
+{
+  "mail" = {
+    version = "2.6.3";
+    source = {
+      type = "gem";
+      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
+    };
+    dependencies = [
+      "mime-types"
+    ];
+  };
+  "mime-types" = {
+    version = "2.6.1";
+    source = {
+      type = "gem";
+      sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
+    };
+  };
+  "taskjuggler" = {
+    version = "3.5.0";
+    source = {
+      type = "gem";
+      sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
+    };
+    dependencies = [
+      "mail"
+      "term-ansicolor"
+    ];
+  };
+  "term-ansicolor" = {
+    version = "1.3.2";
+    source = {
+      type = "gem";
+      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
+    };
+    dependencies = [
+      "tins"
+    ];
+  };
+  "tins" = {
+    version = "1.6.0";
+    source = {
+      type = "gem";
+      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14161743097..c98752b2732 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14957,7 +14957,11 @@ in
   teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
-  taskjuggler = callPackage ../applications/misc/taskjuggler { };
+  taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { };
+
+  taskjuggler = callPackage ../applications/misc/taskjuggler/3.x {
+    ruby = ruby_2_0;
+  };
 
   tasknc = callPackage ../applications/misc/tasknc { };