diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 1feb3ecae714..d2e20838ecaf 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,41 +1,41 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 +{ stdenv +, lib +, fetchFromGitHub +, ocaml +, findlib +, ocamlbuild +, oasis +, camlp4 , num }: -let param = - if lib.versionAtLeast ocaml.version "4.03" - then { - version = "0.8.1"; - sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9"; - buildInputs = [ num ]; - } else { - version = "0.7.1"; - sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms"; - }; -in +if !lib.versionAtLeast ocaml.version "4.03" +then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}" +else -let inherit (param) version; in +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-ocsigen-deriving"; + version = "0.8.2"; -stdenv.mkDerivation { - pname = "ocsigen-deriving"; - inherit version; - src = fetchzip { - url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "deriving"; + rev = version; + sha256 = "sha256:09rp9mrr551na0nmclpxddlrkb6l2d7763xv14xfx467kff3z0wf"; }; - buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ] - ++ (param.buildInputs or []); - createFindlibDestdir = true; - meta = { + buildInputs = [ ocaml findlib ocamlbuild oasis camlp4 num ]; + + meta = { homepage = "https://github.com/ocsigen/deriving"; description = "Extension to OCaml for deriving functions from type declarations"; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with lib.maintainers; [ - gal_bolle vbgl + gal_bolle + vbgl ]; }; |