diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-02-19 14:11:24 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-03-10 16:12:03 +0100 |
| commit | 336ac1683896bad27836f4da5c4f2a6f982119a2 (patch) | |
| tree | c65f11ca8bd3889f2ca4940fd18cb13df8ad3db3 | |
| parent | 462d059909c5710622db5914178ec0a984608fbf (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.
3 files changed, 12 insertions, 6 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; }) diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 5b7d9c3210d43..6c7d746e9481d 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -14,6 +14,8 @@ buildDunePackage (args // { sha256 = hash; }; - meta.license = lib.licenses.mit; - meta.homepage = "https://github.com/janestreet/${pname}"; + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; }) diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index 9675c8d019a02..1ed2e6bc4f203 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -22,6 +22,8 @@ buildDunePackage (args // { inherit doCheck; - meta.license = lib.licenses.mit; - meta.homepage = "https://github.com/janestreet/${pname}"; + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; }) |