From 25956178358a73025fdb52e9f0da275661f9ff76 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 27 Jan 2026 22:50:54 +0100 Subject: [PATCH] ocamlPackages.uuseg: set pname instead of name --- .../development/ocaml-modules/uuseg/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 3c674459cd1e..24e06ba09c35 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -13,24 +13,19 @@ cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1", }: -let +stdenv.mkDerivation (finalAttrs: { + name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "uuseg"; - webpage = "https://erratique.ch/software/${pname}"; -in - -stdenv.mkDerivation rec { - - name = "ocaml${ocaml.version}-${pname}-${version}"; inherit version; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; + url = "https://erratique.ch/software/uuseg/releases/uuseg-${finalAttrs.version}.tbz"; hash = { "17.0.0" = "sha256-Fn41ajEFbMv3LLkD+zqy76217/kWFS7q9jm9ubc6TI4="; "15.0.0" = "sha256-q8x3bia1QaKpzrWFxUmLWIraKqby7TuPNGvbSjkY4eM="; } - ."${version}"; + ."${finalAttrs.version}"; }; nativeBuildInputs = [ @@ -60,10 +55,10 @@ stdenv.mkDerivation rec { meta = { description = "OCaml library for segmenting Unicode text"; - homepage = webpage; + homepage = "https://erratique.ch/software/uuseg"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "usegtrip"; inherit (ocaml.meta) platforms; }; -} +})