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

sexplib: rename from ocaml_sexplib to sexplib 

There really isn't any need for it to be named ocaml_sexplib
This commit is contained in:
Eric Merritt 2015-05-24 10:14:14 -07:00
parent cac000d73a
commit ea0d507935
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
View File

@ -1,15 +1,15 @@
{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}: {ocaml, findlib, stdenv, fetchurl, sexplib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-ipaddr-2.5.0"; name = "ocaml-ipaddr-2.5.0";
src = fetchurl { src = fetchurl {
url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz; url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz;
sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917"; sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917";
}; };
buildInputs = [ocaml findlib]; buildInputs = [ocaml findlib];
propagatedBuildInputs = [ocaml_sexplib]; propagatedBuildInputs = [sexplib];
createFindlibDestdir = true; createFindlibDestdir = true;
@ -19,5 +19,5 @@ stdenv.mkDerivation {
maintainers = [ maintainers.vbgl ]; maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms; platforms = ocaml.meta.platforms;
}; };
} }

8
pkgs/top-level/all-packages.nix
View File

@ -4118,7 +4118,6 @@ let
cstruct = callPackage ../development/ocaml-modules/cstruct { cstruct = callPackage ../development/ocaml-modules/cstruct {
lwt = ocaml_lwt; lwt = ocaml_lwt;
sexplib = ocaml_sexplib;
}; };
csv = callPackage ../development/ocaml-modules/csv { }; csv = callPackage ../development/ocaml-modules/csv { };
@ -4141,7 +4140,6 @@ let
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
lwt = ocaml_lwt; lwt = ocaml_lwt;
sexplib = ocaml_sexplib;
}; };
fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; fieldslib = callPackage ../development/ocaml-modules/fieldslib { };
@ -4307,7 +4305,7 @@ let
sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { };
sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { };
ocaml_sexplib = sexplib =
if lib.versionOlder "4.02" ocaml_version if lib.versionOlder "4.02" ocaml_version
then sexplib_112_24_01 then sexplib_112_24_01
else if lib.versionOlder "4.00" ocaml_version else if lib.versionOlder "4.00" ocaml_version
@ -4349,9 +4347,7 @@ let
uucp = callPackage ../development/ocaml-modules/uucp { }; uucp = callPackage ../development/ocaml-modules/uucp { };
uunf = callPackage ../development/ocaml-modules/uunf { }; uunf = callPackage ../development/ocaml-modules/uunf { };
uri = callPackage ../development/ocaml-modules/uri { uri = callPackage ../development/ocaml-modules/uri { };
sexplib = ocaml_sexplib;
};
uuseg = callPackage ../development/ocaml-modules/uuseg { }; uuseg = callPackage ../development/ocaml-modules/uuseg { };
uutf = callPackage ../development/ocaml-modules/uutf { }; uutf = callPackage ../development/ocaml-modules/uutf { };