From af85242e1bd93ca8af27bf755c0a6e07f867cf12 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 27 Jan 2026 22:55:04 +0100 Subject: [PATCH] ocamlPackages.vg: set pname and version instead of name --- pkgs/development/ocaml-modules/vg/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 8f7dce667f8e..508e4055200f 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -17,17 +17,14 @@ let inherit (lib) optionals versionOlder; - +in +stdenv.mkDerivation (finalAttrs: { + name = "ocaml${ocaml.version}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "vg"; version = "0.9.5"; - webpage = "https://erratique.ch/software/${pname}"; -in -stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; + url = "https://erratique.ch/software/vg/releases/vg-${finalAttrs.version}.tbz"; hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw="; }; @@ -71,11 +68,11 @@ stdenv.mkDerivation { Renderers for PDF, SVG and the HTML canvas are distributed with the module. An API allows to implement new renderers. ''; - homepage = webpage; + homepage = "https://erratique.ch/software/vg"; license = lib.licenses.isc; maintainers = [ lib.maintainers.jirkamarsik ]; mainProgram = "vecho"; inherit (ocaml.meta) platforms; broken = versionOlder ocaml.version "4.14"; }; -} +})