From 0ae4fd5bc35debb865d37142cf2bc59c66089030 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 14 Jun 2021 04:02:58 +0200 Subject: [PATCH] ocamlPackages.cstruct: remove at 1.9.0 for OCaml < 4.02 This removes unreachable code. --- .../ocaml-modules/cstruct/1.9.0.nix | 36 ------------------- pkgs/top-level/ocaml-packages.nix | 5 +-- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/cstruct/1.9.0.nix diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix deleted file mode 100644 index 750a153c1c48..000000000000 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools -, async ? null, lwt ? null -}: - -assert lib.versionAtLeast ocaml.version "4.01"; - -let version = "1.9.0"; in - -let opt = b: "--${if b != null then "en" else "dis"}able"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-cstruct-${version}"; - - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cstruct"; - rev = "v${version}"; - sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; - }; - - configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ]; - - buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ]; - propagatedBuildInputs = [ ocplib-endian sexplib ]; - - createFindlibDestdir = true; - dontStrip = true; - - meta = with lib; { - homepage = "https://github.com/mirage/ocaml-cstruct"; - description = "Map OCaml arrays onto C-like structs"; - license = lib.licenses.isc; - maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bdb16cba2a78..9168661a75b9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -215,10 +215,7 @@ let csexp = callPackage ../development/ocaml-modules/csexp { }; - cstruct = - if lib.versionAtLeast ocaml.version "4.2" - then callPackage ../development/ocaml-modules/cstruct {} - else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { }; + cstruct = callPackage ../development/ocaml-modules/cstruct {}; cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { };