diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix deleted file mode 100644 index e34e3ae01462..000000000000 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg -, cpuid, ocb-stubblr, sexplib -, cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin -, cstruct-lwt ? null -}: - -with lib; -let - withLwt = cstruct-lwt != null; - # the build system will call 'cc' with no way to override - # this is wrong when we're cross-compiling, so insert a wrapper - cc-wrapper = writeScriptBin "cc" '' - set -e - $CC "$@" - ''; -in - -if versionOlder ocaml.version "4.08" -then throw "nocrypto is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-nocrypto"; - version = "0.5.4"; - - src = fetchurl { - url = "https://github.com/mirleft/ocaml-nocrypto/releases/download/v${version}/nocrypto-${version}.tbz"; - sha256 = "0zshi9hlhcz61n5z1k6fx6rsi0pl4xgahsyl2jp0crqkaf3hqwlg"; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0001-add-missing-runtime-dependencies-in-_tags.patch"; - sha256 = "1asybwj3rl07b4q4cxwy80a7j17j0i5vzz77p38hymilhc2ky7xn"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0002-add-ppx_sexp_conv-as-a-runtime-dependency-in-the-pac.patch"; - sha256 = "0zmp64n5fgkawpkyw0vv0bg0i2c3xbsxqy17vwy92nf5rbardi1r"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0003-Auto-detect-ppx_sexp_conv-runtime-library.patch"; - sha256 = "0lngbg5gyd5gs56lbjh6g86cps1y8x1xsqzi0vi1v28al1gn5dhw"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0004-pack-package-workaround-ocamlbuild-272.patch"; - sha256 = "16k0w78plvqhl17qiqq1mckxhhcdysqgs94l54a1bn0l6fx3rvb9"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0005-use-modern-cstruct-findlib.patch"; - sha256 = "021k38zbdidw6g7j4vjxlnbsrnzq07bnavxzdjq23nbwlifs2nq9"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/nocrypto/nocrypto.0.5.4-1/files/0006-explicit-dependency-on-sexplib.patch"; - sha256 = "15kd0qgi96yxr3qkmaqny591l0s6qmwpprxd5xdx9qwv72hq813z"; - }) - ]; - - nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ]; - buildInputs = [ topkg cpuid ocb-stubblr ocamlbuild ]; - propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; - - strictDeps = true; - - buildPhase = "${topkg.buildPhase} --accelerate false --with-lwt ${boolToString withLwt}"; - inherit (topkg) installPhase; - - meta = { - homepage = "https://github.com/mirleft/ocaml-nocrypto"; - description = "Simplest possible crypto to support TLS"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/wodan/default.nix b/pkgs/development/ocaml-modules/wodan/default.nix index 64ca29f20308..f33d7b9861f6 100644 --- a/pkgs/development/ocaml-modules/wodan/default.nix +++ b/pkgs/development/ocaml-modules/wodan/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub, lwt_ppx, ppx_cstruct, optint -, checkseum, diet, bitv, nocrypto, logs, lru, io-page, mirage-block }: +, checkseum, diet, bitv, logs, lru, io-page, mirage-block }: buildDunePackage rec { pname = "wodan"; @@ -24,7 +24,7 @@ buildDunePackage rec { checkseum diet bitv - nocrypto + /* nocrypto */ logs lru io-page @@ -32,6 +32,7 @@ buildDunePackage rec { ]; meta = with lib; { + broken = true; # nocrypto is no longer available in nixpkgs inherit (src.meta) homepage; description = "A flash-friendly, safe and flexible filesystem library"; license = licenses.isc; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 75719cf6b59b..55817beb5c87 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -921,8 +921,6 @@ let netchannel = callPackage ../development/ocaml-modules/netchannel { }; - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; - nonstd = callPackage ../development/ocaml-modules/nonstd { }; notty = callPackage ../development/ocaml-modules/notty { };