From bca4ad048701d2b0a472c0e0f0e3e24d62ccc9b0 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 10 May 2022 10:36:58 -0700 Subject: [PATCH] ocamlPackages: inherit ocaml.meta.platforms --- pkgs/development/ocaml-modules/benchmark/default.nix | 2 +- pkgs/development/ocaml-modules/camlzip/default.nix | 2 +- pkgs/development/ocaml-modules/camomile/0.8.2.nix | 2 +- pkgs/development/ocaml-modules/camomile/0.8.5.nix | 2 +- pkgs/development/ocaml-modules/cmdliner/default.nix | 2 +- pkgs/development/ocaml-modules/cpdf/default.nix | 2 +- pkgs/development/ocaml-modules/cryptgps/default.nix | 2 +- pkgs/development/ocaml-modules/curses/default.nix | 2 +- pkgs/development/ocaml-modules/dypgen/default.nix | 2 +- pkgs/development/ocaml-modules/extlib/default.nix | 2 +- pkgs/development/ocaml-modules/functory/default.nix | 2 +- pkgs/development/ocaml-modules/jsonm/default.nix | 2 +- pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 2 +- pkgs/development/ocaml-modules/lablgtk/default.nix | 2 +- pkgs/development/ocaml-modules/llvm/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-cairo/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlnat/default.nix | 2 +- pkgs/development/ocaml-modules/ocamlnet/default.nix | 2 +- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 2 +- pkgs/development/ocaml-modules/otfm/default.nix | 2 +- pkgs/development/ocaml-modules/rope/default.nix | 2 +- pkgs/development/ocaml-modules/sawja/default.nix | 2 +- pkgs/development/ocaml-modules/sodium/default.nix | 2 +- pkgs/development/ocaml-modules/syslog/default.nix | 2 +- pkgs/development/ocaml-modules/tsdl/default.nix | 2 +- pkgs/development/ocaml-modules/ulex/default.nix | 2 +- pkgs/development/ocaml-modules/uuidm/default.nix | 2 +- pkgs/development/ocaml-modules/xmlm/default.nix | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index c8016230724..f2a98516c75 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "Benchmark running times of code"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ volth ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 8124b8d8e43..caf3e7a63f0 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { for reading from and writing to compressed files in these formats. ''; license = "LGPL+linking exceptions"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 43bbfe7b6a6..502e517b2a9 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A comprehensive Unicode library for OCaml"; license = lib.licenses.lgpl21; branch = "0.8.2"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index e6395383698..7726a95cece 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; license = lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 77970556100..ed96b1b6155 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/cmdliner"; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index b1694885258..360848881a9 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.coherentpdf.com/"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "PDF Command Line Tools"; license = licenses.unfree; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index aeaa87aaf75..60f64c34054 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { itself. ''; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 824f24ab955..b9006012ae5 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; changelog = "https://github.com/mbacarella/curses/raw/${version}/CHANGES"; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 64017bd65fe..f504e3d7ca4 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; license = lib.licenses.cecill-b; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 7f50548f4b8..7baee7a6032 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; license = lib.licenses.lgpl21Only; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index a05472366a2..3c56aaf0a0a 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index d29b19b3b40..f90a252264f 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; mainProgram = "jsontrip"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index f37c3b5c6f9..47f48c89be7 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { meta = { branch = "2.14"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi lib.maintainers.roconnor diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 36ade6979c3..7eb94bc188a 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { dontStrip = true; meta = with lib; { - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ maggesi roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index c0600df64f2..93824894455 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { inherit (libllvm.meta) license homepage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "OCaml bindings distributed with LLVM"; maintainers = with lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 6748619d492..f0e70699ad8 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = "http://cairographics.org/cairo-ocaml"; description = "ocaml bindings for cairo library"; license = lib.licenses.gpl2; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index f2336cf88bb..f4a9e55cc12 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://libvirt.org/ocaml/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 66bd00707ad..0be4e780663 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { x86 or x86-64 processors. Support for additional architectures and operating systems is planned, but not yet available. ''; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index d435d7a0484..22cd84da1f8 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "http://projects.camlcity.org/projects/ocamlnet.html"; description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.maggesi ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index daa64b7e301..704354202d1 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -67,7 +67,7 @@ buildDunePackage rec { A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; license = lib.licenses.lgpl21Only; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 91d91bdc46f..f6717458791 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { of them. ''; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 9ac090a780e..483aefef12d 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://rope.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = ''Ropes ("heavyweight strings") in OCaml''; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ volth ]; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index eaad7e7f1bb..78d28270035 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { homepage = "http://sawja.inria.fr/"; license = licenses.gpl3Plus; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 040a34ef6f1..74983fef3e7 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dsheets/ocaml-sodium"; description = "Binding to libsodium 1.0.9+"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.rixed ]; }; } diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index 9614c404c5b..ccec0329638 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rixed/ocaml-syslog"; description = "Simple wrapper to access the system logger from OCaml"; license = licenses.lgpl21Plus; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ maintainers.rixed ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 3a1990326df..44cc2076fbb 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; license = licenses.isc; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index d08f2c4c0ae..b871bc403ed 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "A lexer generator for Unicode and OCaml"; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 7df1c588dd3..5e6d71c19ef 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.maurer ]; mainProgram = "uuidtrip"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 34878cb30bb..9396dd7b914 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; mainProgram = "xmltrip"; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; }