From 6893d8a2fdc5dc609c6a4be97b87ba95ee6a0bcf Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 18 Feb 2017 14:57:51 +0100 Subject: [PATCH] llpp: move out of ocamlPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11ea168cd91..22b63a492ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14098,7 +14098,7 @@ with pkgs; bison = bison2; }; - inherit (ocaml-ng.ocamlPackages_4_04) llpp; + llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { }; lmms = callPackage ../applications/audio/lmms { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 08c8d64a15e..5f000099e14 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -698,11 +698,6 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - llpp = - if lib.versionOlder "4.04" ocaml.version - then callPackage ../applications/misc/llpp { } - else null; - monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (pkgs.gnome2) libgnomecanvas glib;