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
pkgs/development/tools/ocaml/findlib/default.nix
+3 -3
View File
@@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
name = "ocaml-findlib-1.4.1";
name = "ocaml-findlib-1.5.3";
src = fetchurl {
url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz;
sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf";
url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz;
sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r";
};
buildInputs = [m4 ncurses ocaml];