From 61f20c94ca8486071cfc1ed0216e7efa3a6079f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 15 Mar 2017 10:12:25 +0100
Subject: [PATCH] taskjuggler: remove 2.x series
The version was released 8 years ago and does not build anymore
---
.../misc/taskjuggler/2.x/default.nix | 76 -------------------
.../misc/taskjuggler/2.x/timezone-glibc.patch | 48 ------------
.../misc/taskjuggler/{3.x => }/Gemfile | 0
.../misc/taskjuggler/{3.x => }/Gemfile.lock | 0
.../misc/taskjuggler/{3.x => }/default.nix | 0
.../misc/taskjuggler/{3.x => }/gemset.nix | 0
pkgs/top-level/all-packages.nix | 8 +-
7 files changed, 2 insertions(+), 130 deletions(-)
delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/default.nix
delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile (100%)
rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile.lock (100%)
rename pkgs/applications/misc/taskjuggler/{3.x => }/default.nix (100%)
rename pkgs/applications/misc/taskjuggler/{3.x => }/gemset.nix (100%)
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
deleted file mode 100644
index 2a199843cb3..00000000000
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{stdenv, fetchurl,
-zlib, libpng, libjpeg, perl, expat, qt3,
-libX11, libXext, libSM, libICE,
-}:
-
-stdenv.mkDerivation rec {
- name = "taskjuggler-2.4.3";
- src = fetchurl {
- url = "http://www.taskjuggler.org/download/${name}.tar.bz2";
- sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl";
- };
-
- buildInputs =
- [zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
- ;
-
- patches = [ ./timezone-glibc.patch ];
-
- preConfigure = ''
- for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do
- substituteInPlace $i --replace /bin/bash $(type -Pp bash)
- done
- for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do
- substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl
- done
-
- # Fix install
- for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do
- # Do not use variable substitution because there is some text after the last '@'
- substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/'
- done
-
- # Comment because the ical export need the KDE support.
- for i in Examples/FirstProject/AccountingSoftware.tjp; do
- substituteInPlace $i --replace "icalreport" "# icalreport"
- done
-
- for i in TestSuite/testdir TestSuite/createrefs \
- TestSuite/Scheduler/Correct/Expression.sh; do
- substituteInPlace $i --replace '/bin/rm' 'rm'
- done
-
- # Some tests require writing at $HOME
- HOME=$TMPDIR
- '';
-
- configureFlags = "
- --without-arts --disable-docs
- --x-includes=${libX11.dev}/include
- --x-libraries=${libX11.out}/lib
- --with-qt-dir=${qt3}
- ";
-
- preInstall = ''
- mkdir -p $out/share/emacs/site-lisp/
- cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
- '';
-
- installFlags =
- # kde_locale is not defined when installing without kde.
- "kde_locale=\${out}/share/locale";
-
- meta = {
- homepage = "http://www.taskjuggler.org";
- license = stdenv.lib.licenses.gpl2;
- description = "Project management tool";
- longDescription = ''
- TaskJuggler is a modern and powerful, Open Source project management
- tool. Its new approach to project planing and tracking is more
- flexible and superior to the commonly used Gantt chart editing
- tools. It has already been successfully used in many projects and
- scales easily to projects with hundreds of resources and thousands of
- tasks.
- '';
- };
-}
diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
deleted file mode 100644
index f599e8a1730..00000000000
--- a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee
-
-From: Chris Schlaeger <cs@kde.org>
-Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100)
-Subject: Try to fix time zone check for glibc 2.11.
-X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda
-
-Try to fix time zone check for glibc 2.11.
-
-Reported-by: Lee <pFQh8RQn4fqB@dyweni.com>
----
-
-diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp
-index 5e2bf21..9b7fce2 100644
---- a/taskjuggler/Utility.cpp
-+++ b/taskjuggler/Utility.cpp
-@@ -206,16 +206,28 @@ setTimezone(const char* tZone)
-
- /* To validate the tZone value we call tzset(). It will convert the zone
- * into a three-letter acronym in case the tZone value is good. If not, it
-- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
-- * to UTC. */
-+ * will
-+ * - copy the wrong value to tzname[0] (glibc < 2.5)
-+ * - or fall back to UTC (glibc >= 2.5 && < 2.11)
-+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11).
-+ */
- tzset();
-+ char* region = new(char[strlen(tZone) + 1]);
-+ region[0] = 0;
-+ if (strchr(tZone, '/'))
-+ {
-+ strcpy(region, tZone);
-+ *strchr(region, '/') = 0;
-+ }
- if (timezone2tz(tZone) == 0 &&
-- (strcmp(tzname[0], tZone) == 0 ||
-+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 ||
- (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
- {
- UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
-+ delete region;
- return false;
- }
-+ delete region;
-
- if (!LtHashTab)
- return true;
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/Gemfile
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile
rename to pkgs/applications/misc/taskjuggler/Gemfile
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
rename to pkgs/applications/misc/taskjuggler/Gemfile.lock
diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/default.nix
rename to pkgs/applications/misc/taskjuggler/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/gemset.nix
rename to pkgs/applications/misc/taskjuggler/gemset.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a35800184a5..33459eb3ea5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4628,7 +4628,7 @@ with pkgs;
yaft = callPackage ../applications/misc/yaft { };
yarn = callPackage ../development/tools/yarn { };
-
+
yasr = callPackage ../applications/audio/yasr { };
yank = callPackage ../tools/misc/yank { };
@@ -15486,11 +15486,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 { };