diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2013-09-03 22:02:07 +0100 |
|---|---|---|
| committer | Oliver Charles <ollie@ocharles.org.uk> | 2013-09-08 13:42:12 +0100 |
| commit | ef72e19b275b9c272bcea7ea0ec723a639a0533b (patch) | |
| tree | 50910919262f96585178e0d10c27fe48273837dc /pkgs | |
| parent | 0021d4495ee90e96081950034b7bd70b54e66a03 (diff) | |
ghc-mod: Wrap to call ghc-get-packages.sh first
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/haskell/ghc-mod/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/lib/maintainers.nix | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b90944816d689..0f60a650d367f 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -25,6 +25,14 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp + mv $out/bin/ghc-mod $out/ghc-mod + cat - > $out/bin/ghc-mod <<EOF + #!/bin/sh + COMMAND=\$1 + shift + eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" + EOF + chmod +x $out/bin/ghc-mod ''; meta = { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; @@ -34,6 +42,7 @@ cabal.mkDerivation (self: { maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.bluescreen303 + self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 373d2a8da4d3e..52487b72490c7 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -7,8 +7,8 @@ aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; - andres = "Andres Loeh <ksnixos@andres-loeh.de>"; amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; + andres = "Andres Loeh <ksnixos@andres-loeh.de>"; antono = "Antono Vasiljev <self@antono.info>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; @@ -34,6 +34,7 @@ marcweber = "Marc Weber <marco-oweber@gmx.de>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; mornfall = "Petr Ročkai <me@mornfall.net>"; + ocharles = "Oliver Charles <ollie@ocharles.org.uk>"; offline = "Jaka Hudoklin <jakahudoklin@gmail.com>"; orbitz = "Malcolm Matalka <mmatalka@gmail.com>"; page = "Carles Pagès <page@cubata.homelinux.net>"; |