Merge pull request #23911 from Mic92/taskjuggler

taskjuggler: remove 2.x series
NixOS · Mar 16, 2017 · 8e62478 · 8e62478
2 parents 5795e5c + 61f20c9
commit 8e62478
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 129 deletions.
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
diff --git a/...applications/misc/taskjuggler/3.x/Gemfile → pkgs/applications/misc/taskjuggler/Gemfile b/...applications/misc/taskjuggler/3.x/Gemfile → pkgs/applications/misc/taskjuggler/Gemfile
diff --git a/...cations/misc/taskjuggler/3.x/Gemfile.lock → ...pplications/misc/taskjuggler/Gemfile.lock b/...cations/misc/taskjuggler/3.x/Gemfile.lock → ...pplications/misc/taskjuggler/Gemfile.lock
diff --git a/...ications/misc/taskjuggler/3.x/default.nix → ...applications/misc/taskjuggler/default.nix b/...ications/misc/taskjuggler/3.x/default.nix → ...applications/misc/taskjuggler/default.nix
diff --git a/...lications/misc/taskjuggler/3.x/gemset.nix → .../applications/misc/taskjuggler/gemset.nix b/...lications/misc/taskjuggler/3.x/gemset.nix → .../applications/misc/taskjuggler/gemset.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15501,11 +15501,7 @@ with pkgs;
   teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
-  taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { };
-
-  taskjuggler = callPackage ../applications/misc/taskjuggler/3.x {
-    ruby = ruby_2_0;
-  };
+  taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; };
 
   tasknc = callPackage ../applications/misc/tasknc { };