diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/ocaml-modules/type_conv | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules/type_conv')
3 files changed, 12 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 69439c1c265f..72e4fcbb35f1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: -if !stdenv.lib.versionAtLeast ocaml.version "3.12" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "3.12" +|| lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://ocaml.janestreet.com/"; description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index a970091df51d..e41e9b188fc8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: -if !stdenv.lib.versionAtLeast ocaml.version "4.00" -|| stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.00" +|| lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation { @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ maggesi ]; + maintainers = with lib.maintainers; [ maggesi ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index ee0ce0ae0be1..3fa9042b0351 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, buildOcaml}: +{ lib, fetchurl, buildOcaml}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -14,7 +14,7 @@ buildOcaml rec { meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maggesi ericbmerritt ]; }; } |