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

Merge branch 'master' into closure-size

Browse Source 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
parent 50fccad582 2463e09173
commit 30f14243c3
344 changed files with 58220 additions and 29215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/cryptokit/default.nix
+3 -3
View File
@@ -7,11 +7,11 @@ in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation {
name = "cryptokit-1.9";
name = "cryptokit-1.10";
src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/1166/cryptokit-1.9.tar.gz;
sha256 = "1jh0jqiwkjy9qplnfcm5r25zdgyk36sxb0c87ks3rjj7khrw1a2n";
url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz;
sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv";
};
buildInputs = [zlib ocaml findlib ncurses];
pkgs/development/ocaml-modules/ocaml-text/default.nix
+7 -6
View File
@@ -1,11 +1,12 @@
{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
{ stdenv, fetchzip, libiconv, ocaml, findlib, ncurses }:
stdenv.mkDerivation {
name = "ocaml-text-0.7.1";
stdenv.mkDerivation rec {
name = "ocaml-text-${version}";
version = "0.8";
src = fetchurl {
url = "https://github.com/vbmithr/ocaml-text/archive/0.7.1.tar.gz";
sha256 = "0dn096q9gjfj7ibj237mb7lq0742a760zawka6i064qns727qwrg";
src = fetchzip {
url = "https://github.com/vbmithr/ocaml-text/archive/${version}.tar.gz";
sha256 = "11jamdfn5s19a0yvl012q1xvdk1grkp4rkrn819imqrvdplqkn1y";
};
buildInputs = [ocaml findlib ncurses libiconv];