From fca7f386db55f4e3bd456855113969e05c0b4804 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Feb 2020 18:37:35 +0100 Subject: trv: remove at 0.1.3 --- pkgs/development/tools/misc/trv/default.nix | 37 ----------------------------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/ocaml-packages.nix | 2 -- 3 files changed, 41 deletions(-) delete mode 100644 pkgs/development/tools/misc/trv/default.nix (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix deleted file mode 100644 index 2e056306db4f..000000000000 --- a/pkgs/development/tools/misc/trv/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 -, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, conduit, magic-mime -}: - -assert stdenv.lib.versionOlder "4.02" ocaml.version; - -stdenv.mkDerivation rec { - pname = "trv"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "afiniate"; - repo = "trv"; - rev = version; - sha256 = "0fv0zh76djqhkzfzwv6k60rnky50pw9gn01lwhijrggrcxrrphz1"; - }; - - - buildInputs = [ ocaml findlib camlp4 ]; - propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 - async_extra_p4 sexplib_p4 async_shell core_extended_p4 - async_find cohttp conduit magic-mime re2_p4 ]; - - createFindlibDestdir = true; - dontStrip = true; - - installFlags = [ "SEMVER=${version}" "PREFIX=$(out)" ]; - - meta = with stdenv.lib; { - homepage = https://github.com/afiniate/trv; - description = "Shim for vrt to enable bootstrapping"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02dcca5065df..8c9720287083 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8986,8 +8986,6 @@ in stdenv = gccStdenv; }; - inherit (ocaml-ng.ocamlPackages_4_02) trv; - bupc = callPackage ../development/compilers/bupc { }; urn = callPackage ../development/compilers/urn { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index dc7abbd15a62..d3f0d620fdec 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1207,8 +1207,6 @@ let ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; - trv = callPackage ../development/tools/misc/trv { }; - omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; -- cgit 1.4.1