diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
| commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
| tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/shells | |
| parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
| parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7beca2109ea6d..27f2b032476e4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoconf, ncurses, which, groff, gettext }: stdenv.mkDerivation rec { - name = "fish-2.0.0"; + name = "fish-2.1.0"; src = fetchurl { - url = http://fishshell.com/files/2.0.0/fish-2.0.0.tar.gz; - sha1 = "2d28553e2ff975f8e5fed6b266f7a940493b6636"; + url = http://fishshell.com/files/2.1.0/fish-2.1.0.tar.gz; + sha1 = "b1764cba540055cb8e2a96a7ea4c844b04a32522"; }; nativeBuildInputs = [ autoconf ]; @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { homepage = http://fishshell.com/; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} \ No newline at end of file +} |