Merge pull request #1583 from MarcWeber/submit/drop-myhasktags

drop myhasktags, current hackage version has everything my version had

4 files changed, 8 insertions, 42 deletions

diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index ece31bbaa74f..981c01e2b4a7 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -56,8 +56,13 @@ args: with args; {
                  tagCmd = "
                    srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\"
                    [ -z \"$srcs\" ] || {
-                    ${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
-                    sort tags > \$TAG_FILE
+                    # without this creating tag files for lifted-base fails
+                    export LC_ALL=en_US.UTF-8
+                    export LANG=en_US.UTF-8
+                    ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""}
+ 
+                    ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags .
+                    mv tags \$TAG_FILE
                    }";
               }
           ];
diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix
deleted file mode 100644
index 62d4ee2579f0..000000000000
--- a/pkgs/tools/misc/myhasktags/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{fetchurl, stdenv, ghcPlain} :
-
-/* use case:
-
-   packageOverrides = {
-
-    haskellCollection =
-     let hp = haskellPackages;
-         install = [ hp.QuickCheck /* ... * /];
-      in
-      misc.collection {
-        name = "my-haskell-packages-collection";
-        list = install ++ (map (x : sourceWithTagsDerivation (sourceWithTagsFromDerivation (addHasktagsTaggingInfo x) ))
-                            (lib.filter (x : builtins.hasAttr "src" x) install ) );
-      };
-   };
-
-*/
-
-stdenv.mkDerivation {
-  name = "hasktags-modified";
-  version = "0.0"; # Haskell Platform 2009.0.0
-  src = fetchurl {
-    url = http://mawercer.de/~nix/hasktags.hs;
-    sha256 = "0zdin03n357viyyqbn2d029jxd83nyazhaxbxfc8v3jrz5pkwl2c";
-  };
-  phases="buildPhase";
-  buildPhase = ''
-    mkdir -p $out/bin
-    ghc --make $src -o $out/bin/hasktags-modified
-  '';
-  buildInputs = [ ghcPlain ];
-
-  meta = {
-    description = "my patched version of hasktags. Should be merged into hasktags?";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 894605c5a639..cdabce2debd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10145,7 +10145,7 @@ let
 
   sourceAndTags = import ../misc/source-and-tags {
     inherit pkgs stdenv unzip lib ctags;
-    hasktags = haskellPackages.myhasktags;
+    hasktags = haskellPackages.hasktags;
   };
 
   splix = callPackage ../misc/cups/drivers/splix { };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7aa857fa112e..a944892f7c11 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2730,8 +2730,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   lhs2tex = callPackage ../tools/typesetting/lhs2tex {};
 
-  myhasktags = callPackage ../tools/misc/myhasktags {};
-
   packunused = callPackage ../development/tools/haskell/packunused {};
 
   splot = callPackage ../development/tools/haskell/splot {};