about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/janestreet/janePackage.nix
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-02-19 14:11:24 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2021-03-10 16:12:03 +0100
commit336ac1683896bad27836f4da5c4f2a6f982119a2 (patch)
treec65f11ca8bd3889f2ca4940fd18cb13df8ad3db3 /pkgs/development/ocaml-modules/janestreet/janePackage.nix
parent462d059909c5710622db5914178ec0a984608fbf (diff)
ocamlPackages.janePackage: don't delete meta set in args
A bit of a pitfall of // is that it doesn't merge recursively which
often leads to unintended deletion in meta sets: If meta is in args it
is also present in the set right of the // operator which means the
right value is used to replace the left value completely. This throws
away anything extra we've set in the meta set in args.

This is fixed by this comment, allowing the descriptions and broken =
true; set in janestreet/old.nix to propagate to the output meta sets.
Diffstat (limited to 'pkgs/development/ocaml-modules/janestreet/janePackage.nix')
-rw-r--r--pkgs/development/ocaml-modules/janestreet/janePackage.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index 0dd0dde6ec9ea..9a67db4966ce5 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -14,6 +14,8 @@ buildDunePackage (args // {
     sha256 = hash;
   };
 
-  meta.license = lib.licenses.asl20;
-  meta.homepage = "https://github.com/janestreet/${pname}";
+  meta = {
+    license = lib.licenses.asl20;
+    homepage = "https://github.com/janestreet/${pname}";
+  } // args.meta;
 })