diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-02 22:44:12 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-02 22:44:12 +0200 |
| commit | ac5d5297dd1d1ef385b7a5ca8b33952343ad4d02 (patch) | |
| tree | ffffd5f31ef6943ae52d4958ab6705e333c31b68 /pkgs/shells | |
| parent | b15c3e49e59a0dc8516480589ee0da385c9ca5d6 (diff) | |
| parent | 1d03574722bd01338f9052b458829f31925f4d21 (diff) | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/shells/ipython/default.nix | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 091da2c68f0da..7beca2109ea6d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, ncurses, which }: +{ stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }: stdenv.mkDerivation rec { name = "fish-2.0.0"; @@ -16,7 +16,18 @@ stdenv.mkDerivation rec { autoconf ''; - meta = { - homepage = http://fishshell.com; + postInstall = '' + sed -i "s|which |command -v |" "$out/share/fish/functions/type.fish" + sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish" + sed -e "s|gettext |${gettext}/bin/gettext |" \ + -e "s|which |command -v |" \ + -i "$out/share/fish/functions/_.fish" + ''; + + meta = with stdenv.lib; { + description = "Smart and user-friendly command line shell"; + homepage = http://fishshell.com/; + license = licenses.gpl2; + platforms = platforms.linux; }; } \ No newline at end of file diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 79c61b8ed2338..b9b9129cb486d 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null && sip != null; buildPythonPackage rec { - name = "ipython-1.0.0"; + name = "ipython-1.1.0"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "074i08a1zr7wjpqc7rm0k3rnq0laf0gjrcxlfvvb3qc48wdm41qd"; + sha256 = "1glivwy7k2dciy0y5i39syngip84nrqhpggn4glmpd2s49jllkkc"; }; propagatedBuildInputs = [ |