MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ocaml: default to version 4.07

Browse source 
patdiff: 0.11.0 → 0.12.0
This commit is contained in:
Vincent Laporte 2019-10-04 05:46:59 +00:00 committed by Vincent Laporte
parent deefc177d3
commit c82c6d3a12
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/misc/patdiff/default.nix
View file

@ -4,8 +4,8 @@ with ocamlPackages;
janePackage {
pname = "patdiff";
hash = "02cdn5j5brbp4n2rpxprzxfakjbl7n2llixg7m632bih3ppmfcq1";
buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
hash = "04krzn6rj2r81z55pms5ayk6bxhlxrm006cbhy0m6rc69a0h00lh";
buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ];
meta = {
description = "File Diff using the Patience Diff algorithm";
};

2
pkgs/top-level/all-packages.nix
View file

@ -19354,7 +19354,7 @@ in
linuxsampler = callPackage ../applications/audio/linuxsampler { };
llpp = ocaml-ng.ocamlPackages_4_07.callPackage ../applications/misc/llpp { };
llpp = ocamlPackages.callPackage ../applications/misc/llpp { };
lmms = libsForQt5.callPackage ../applications/audio/lmms {
lame = null;

10
pkgs/top-level/ocaml-packages.nix
View file

@ -829,13 +829,15 @@ let
# Jane Street
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janePackage =
if lib.versionOlder "4.07" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {}
else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
janeStreet =
if lib.versionOlder "4.07" ocaml.version
then import ../development/ocaml-modules/janestreet/0.12.nix {
janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {};
inherit ctypes num octavius ppxlib re;
inherit ctypes janePackage num octavius ppxlib re;
inherit (pkgs) openssl;
}
else import ../development/ocaml-modules/janestreet {
@ -1137,5 +1139,5 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_latest = ocamlPackages_4_09;
ocamlPackages = ocamlPackages_4_06;
ocamlPackages = ocamlPackages_4_07;
}