public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source 
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
This commit is contained in:
Peter Simons
2013-12-04 18:33:45 +01:00
parent 88c7b4c7fe 41f0e6ad92
commit c32bf83301
765 changed files with 14556 additions and 11365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/shells/fish/default.nix
View File

@@ -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 ];
};
}
}