diff options
author | Profpatsch <mail@profpatsch.de> | 2016-11-04 12:24:57 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2016-11-04 12:24:57 +0100 |
commit | 2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213 (patch) | |
tree | 947e0194e8689d45eb9d83aaa27c3471bcbfd350 /pkgs/development/ocaml-modules/x509/default.nix | |
parent | c5cac5051af83b41c3601e7e7116f7b49c8dd010 (diff) | |
download | nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.gz nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.bz2 nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.lz nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.xz nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.tar.zst nixlib-2bd86e9e47d82acf296b353e2bd6b5cb6b7ba213.zip |
Revert "Merge pull request #20090 from sternenseemann/master"
Reason: https://github.com/NixOS/nixpkgs/pull/20090#commitcomment-19686426 This reverts commit 9ffcb1b2503303bfdb4a8fc31c8e4160184eb74c, reversing changes made to a6283c1126676d30de3abfb3ee8865505da0ed43.
Diffstat (limited to 'pkgs/development/ocaml-modules/x509/default.nix')
-rw-r--r-- | pkgs/development/ocaml-modules/x509/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index bca266d5fee1..c44ccb18982a 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,30 +1,28 @@ -{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}: +{ stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }: -buildOcaml rec { - name = "x509"; - version = "0.5.3"; +let version = "0.5.0"; in - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-x509"; - rev = "${version}"; - sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7"; +stdenv.mkDerivation { + name = "ocaml-x509-${version}"; + + src = fetchzip { + url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz"; + sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn"; }; - buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + buildInputs = [ ocaml findlib ounit ]; propagatedBuildInputs = [ asn1-combinators nocrypto ]; configureFlags = "--enable-tests"; - configurePhase = "./configure --prefix $out $configureFlags"; - doCheck = true; checkTarget = "test"; createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - license = licenses.bsd2; - maintainers = with maintainers; [ vbgl ]; + platforms = ocaml.meta.platforms or []; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } |