Skip to content

Commit 8c82ddc

Browse files
authored
ocamlPackages.uuseg: set pname instead of name (NixOS#484537)
2 parents 6e6fb1e + 2595617 commit 8c82ddc

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

pkgs/development/ocaml-modules/uuseg/default.nix

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,19 @@
1313
cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1",
1414
}:
1515

16-
let
16+
stdenv.mkDerivation (finalAttrs: {
17+
name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}";
1718
pname = "uuseg";
18-
webpage = "https://erratique.ch/software/${pname}";
19-
in
20-
21-
stdenv.mkDerivation rec {
22-
23-
name = "ocaml${ocaml.version}-${pname}-${version}";
2419
inherit version;
2520

2621
src = fetchurl {
27-
url = "${webpage}/releases/${pname}-${version}.tbz";
22+
url = "https://erratique.ch/software/uuseg/releases/uuseg-${finalAttrs.version}.tbz";
2823
hash =
2924
{
3025
"17.0.0" = "sha256-Fn41ajEFbMv3LLkD+zqy76217/kWFS7q9jm9ubc6TI4=";
3126
"15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM=";
3227
}
33-
."${version}";
28+
."${finalAttrs.version}";
3429
};
3530

3631
nativeBuildInputs = [
@@ -60,10 +55,10 @@ stdenv.mkDerivation rec {
6055

6156
meta = {
6257
description = "OCaml library for segmenting Unicode text";
63-
homepage = webpage;
58+
homepage = "https://erratique.ch/software/uuseg";
6459
license = lib.licenses.bsd3;
6560
maintainers = [ lib.maintainers.vbgl ];
6661
mainProgram = "usegtrip";
6762
inherit (ocaml.meta) platforms;
6863
};
69-
}
64+
})

0 commit comments

Comments
 (0)