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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-16 15:16:50 +02:00
parent 3c6efec2c0 e39bf7a704
commit 09dc132e04
826 changed files with 8930 additions and 7226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/perl/5.20/default.nix
View File

@@ -23,11 +23,11 @@ with {
};
stdenv.mkDerivation rec {
name = "perl-5.20.0";
name = "perl-5.20.1";
src = fetchurl {
url = "mirror://cpan/src/${name}.tar.gz";
sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f";
url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz";
sha256 = "1dfl4v5fngnkd1c4278gcdjgcapsw7laxq0b34nxrx76z4805wgy";
};
patches =