From 60abf7125e44d1ac58edd10b2b4977418a0801df Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 14 Jul 2014 15:43:21 +0200
Subject: pkgs: Drop package for fish shell.

This is already included in upstream <nixpkgs>, so we no longer need to
let it rot here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/default.nix      |  1 -
 pkgs/fish/default.nix | 43 -------------------------------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 pkgs/fish/default.nix

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 29ac65c2..1743fd54 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,7 +7,6 @@ let
   self = {
     axbo = callPackage ./axbo { };
     blop = callPackage ./blop { };
-    fish = callPackage ./fish { };
     gajim = callPackage ./gajim/0.16-pre.nix {
       inherit (pkgs.xlibs) libX11;
     };
diff --git a/pkgs/fish/default.nix b/pkgs/fish/default.nix
deleted file mode 100644
index bc37837b..00000000
--- a/pkgs/fish/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, autoconf, ncurses, groff, pythonPackages }:
-
-stdenv.mkDerivation rec {
-  name = "fish-${version}";
-  version = "2.0.0";
-
-  buildInputs = [ autoconf ncurses pythonPackages.python ];
-
-  pythonPath = [ pythonPackages.curses ];
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    autoconf
-    sed -i 's/\<which\>/type -P/g' configure
-  '';
-
-  postFixup = ''
-    gen_inserts() {
-      for i in $pythonPath; do
-        echo -n "; sys.path.insert(0, '$(toPythonPath "$i")')"
-      done
-    }
-
-    find "$out/share/fish/tools" -type f -perm +0100 -name '*.py' |
-    xargs sed -i -r \
-      -e '1 { /^#!/c #!${pythonPackages.python}/bin/python
-            }' \
-      -e '0,/^(from|import)/{/^(from|import)/a import sys'"$(gen_inserts)"'
-                            }'
-
-    sed -i -e "/Popen/s/'manpath'/'man', '-w'/p" \
-      "$out/share/fish/tools/create_manpage_completions.py"
-
-    sed -i -e 's|nroff|${groff}/bin/nroff|g' \
-      "$out/share/fish/functions/__fish_print_help.fish"
-  '';
-
-  src = fetchurl {
-    url = "http://fishshell.com/files/${version}/fish.tar.gz";
-    sha1 = "2d28553e2ff975f8e5fed6b266f7a940493b6636";
-  };
-}
-- 
cgit 1.4.1