diff --git a/pkgs/development/tools/misc/hasktags/default.nix b/pkgs/development/tools/misc/hasktags/default.nix deleted file mode 100644 index a9cb8cef14bf..000000000000 --- a/pkgs/development/tools/misc/hasktags/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -args: -args.stdenv.mkDerivation { - name = "hasktags-modified"; - - src = args.fetchurl { - url = http://mawercer.de/hasktags.hs; - sha256 = "1dpf91s8k5gnykdhp6y94gimbh7z58156f5d8y918wxmj08gbb8g"; - }; - - buildInputs =(with args; [ghc]); - - phases = "buildPhase"; - - # calling it hasktags-modified to not clash with the one distributed with ghc - buildPhase = " - ensureDir \$out/bin - ghc --make \$src -o \$out/bin/hasktags-modified - "; - - meta = { - # this can be removed again when somone comitts my changes into the distribution - description = "Marc's modified hasktags"; - }; -} diff --git a/pkgs/misc/ghc68executables/default.nix b/pkgs/misc/ghc68executables/default.nix index 52b28f3ba2cd..d2d53344d8ab 100644 --- a/pkgs/misc/ghc68executables/default.nix +++ b/pkgs/misc/ghc68executables/default.nix @@ -7,6 +7,28 @@ executables = lib.mapAttrs ( name_dummy : a : ghcCabalExecutableFun (a // { libs inherit (args) lib pkgs; inherit bleedingEdgeRepos; }; + + hasktags = { + # calling it hasktags-modified to not clash with the one distributed with ghc + name = "hasktags-modified"; + src = args.fetchurl { + url = http://mawercer.de/~nix/hasktags.hs; + sha256 = "9d1be56133f468f5a2302d8531742eba710ad89d5a271308453b44cc9f47e94a"; + }; + libsFun = x : [x.base x.directory x.haskell98 x.mtl]; + pass = { + phases = "buildPhase"; + buildPhase = " + ensureDir \$out/bin; cp $src hasktags.hs + ghc --make hasktags.hs -o \$out/bin/hasktags-modified + "; + }; + meta = { + # this package can be removed again when somone comitts my changes into the distribution + description = "Marc's modified hasktags"; + }; + }; + happy = { name = "happy-1.17"; libsFun = x : [x.base x.directory x.haskell98 x.mtl]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3c011ff6fe1..9e5e1b824432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1457,7 +1457,8 @@ let pkgs = rec { assert builtins ? listToAttrs; recurseIntoAttrs (import ../development/compilers/ghcs { inherit ghcboot fetchurl stdenv recurseIntoAttrs perl gnum4 gmp readline lib; - inherit ghcPkgUtil hasktags ctags autoconf automake getConfig; + inherit ghcPkgUtil ctags autoconf automake getConfig; + inherit (ghc68executables) hasktags; inherit (bleedingEdgeRepos) sourceByName; # needed for install darcs ghc version @@ -2254,11 +2255,6 @@ let pkgs = rec { inherit cabal perl; }; - hasktags = import ../development/tools/misc/hasktags { - inherit fetchurl stdenv; - ghc = ghcsAndLibs.ghc68.ghc; - }; - help2man = import ../development/tools/misc/help2man { inherit fetchurl stdenv perl gettext perlLocaleGettext; }; @@ -7398,7 +7394,8 @@ let pkgs = rec { }; sourceAndTags = import ../misc/source-and-tags { - inherit pkgs stdenv unzip lib ctags hasktags; + inherit pkgs stdenv unzip lib ctags; + inherit (ghc68executables) hasktags; }; synaptics = import ../misc/synaptics {