From e6b92df151b7fbc8d549b4a0a782363801718d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 31 Dec 2025 17:10:53 +0100 Subject: [PATCH] packages/baguette_sharp: use finalAttrs --- .../{baguette-sharp => baguette_sharp}/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename nix/packages/by-name/{baguette-sharp => baguette_sharp}/package.nix (85%) diff --git a/nix/packages/by-name/baguette-sharp/package.nix b/nix/packages/by-name/baguette_sharp/package.nix similarity index 85% rename from nix/packages/by-name/baguette-sharp/package.nix rename to nix/packages/by-name/baguette_sharp/package.nix index f7cb2967..1900da47 100644 --- a/nix/packages/by-name/baguette-sharp/package.nix +++ b/nix/packages/by-name/baguette_sharp/package.nix @@ -2,10 +2,9 @@ lib, fetchFromGitHub, fetchpatch, - ocaml, ocamlPackages, }: -ocamlPackages.buildDunePackage rec { +ocamlPackages.buildDunePackage (finalAttrs: { pname = "baguette_sharp"; version = "2.3.0"; @@ -15,7 +14,7 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "vanilla-extracts"; repo = "ocaml-baguettesharp-interpreter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-GI60O6om71P3L+fGHGBCZ+U8vMlwPgYTWZCSCnEM0Wc="; }; @@ -23,10 +22,9 @@ ocamlPackages.buildDunePackage rec { fmt linenoise ]; - doCheck = lib.versionAtLeast ocaml.version "4.13.1"; patches = [ (fetchpatch { - name = "fix dune"; + name = "dune-fix"; url = "https://github.com/vanilla-extracts/ocaml-baguettesharp-interpreter/commit/8809bc39a5e2cb02f757636f9939dc7818876779.patch"; hash = "sha256-j0C2T3ZZ3K2Xvvl0qH5zl0znTkiUR8PO9FlqqPUX2aw="; }) @@ -36,5 +34,6 @@ ocamlPackages.buildDunePackage rec { homepage = "https://github.com/vanilla-extracts/ocaml-baguettesharp-interpreter"; description = "OCaml Implementation of the (famous) Baguette# exotic language, used as TIPE for the 2022,2023 seasons concours"; license = lib.licenses.gpl3Plus; + mainProgram = "baguette_sharp.repl"; }; -} +})