JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #226835 from vbgl/ocaml-janestreet-legacy-clean

Browse Source 
ocamlPackages.janeStreet: small cleaning of legacy package sets
This commit is contained in:
Ulrik Strid 2023-04-18 20:28:41 +02:00 committed by GitHub
commit ca07838f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/conduit/async.nix
View File

@ -1,4 +1,4 @@
{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit
{ lib, buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit
, core, ipaddr, ipaddr-sexp, sexplib
}:

12
pkgs/development/ocaml-modules/janestreet/0.12.nix
View File

@ -377,18 +377,6 @@ with self;
propagatedBuildInputs = [ async_extra textutils ];
};
async_ssl = janePackage {
pname = "async_ssl";
hash = "02ard8x5q5c42d9jdqmyzfx624yjq8cxxmvq3zb82hf6p8cc57ml";
meta = {
description = "An Async-pipe-based interface with OpenSSL";
# ctypes no longer works with dune 1
# dune 2 no longer supports jbuild
broken = true;
};
propagatedBuildInputs = [ async ctypes openssl ];
};
async_find = janePackage {
pname = "async_find";
hash = "0qsz9f15s5rlk6za10s810v6nlkdxg2g9p1827lcpa7nhjcpi673";

12
pkgs/development/ocaml-modules/janestreet/default.nix
View File

@ -413,18 +413,6 @@ with self;
meta.description = "Shell helpers for Async";
};
async_ssl = janePackage {
pname = "async_ssl";
hash = "1p83fzfla4rb820irdrz3f2hp8kq5zrhw47rqmfv6qydlca1bq64";
propagatedBuildInputs = [ async ctypes openssl ];
meta = {
description = "Async wrappers for SSL";
# ctypes no longer works with dune 1
# dune 2 no longer supports jbuild
broken = true;
};
};
sexp_pretty = janePackage {
pname = "sexp_pretty";
hash = "0xskahjggbwvvb82fn0jp1didxbgpmgks76xhwp9s3vqkhgz6918";

2
pkgs/development/ocaml-modules/janestreet/janePackage.nix
View File

@ -5,7 +5,7 @@
buildDunePackage (args // {
inherit version buildInputs;
useDune2 = false;
duneVersion = "1";
minimalOCamlVersion = "4.04";

2
pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
View File

@ -5,7 +5,7 @@
buildDunePackage (args // {
inherit version;
useDune2 = false;
duneVersion = "1";
minimalOCamlVersion = "4.07";