alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ocamlPackages.janePackage: don't delete meta set in args

Browse source 
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.
This commit is contained in:
sternenseemann 2021-02-19 14:11:24 +01:00 committed by Vincent Laporte
parent 462d059909
commit 336ac16838
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/ocaml-modules/janestreet/janePackage.nix
View file

@ -14,6 +14,8 @@ buildDunePackage (args // {
sha256 = hash; sha256 = hash;
}; };
meta.license = lib.licenses.asl20; meta = {
meta.homepage = "https://github.com/janestreet/${pname}"; license = lib.licenses.asl20;
homepage = "https://github.com/janestreet/${pname}";
} // args.meta;
}) })

6
pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
View file

@ -14,6 +14,8 @@ buildDunePackage (args // {
sha256 = hash; sha256 = hash;
}; };
meta.license = lib.licenses.mit; meta = {
meta.homepage = "https://github.com/janestreet/${pname}"; license = lib.licenses.mit;
homepage = "https://github.com/janestreet/${pname}";
} // args.meta;
}) })

6
pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
View file

@ -22,6 +22,8 @@ buildDunePackage (args // {
inherit doCheck; inherit doCheck;
meta.license = lib.licenses.mit; meta = {
meta.homepage = "https://github.com/janestreet/${pname}"; license = lib.licenses.mit;
homepage = "https://github.com/janestreet/${pname}";
} // args.meta;
}) })