From c9fe63b8040b754481629c6fbd8aa3437f94734c Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Thu, 5 Mar 2026 01:57:48 +1100 Subject: [PATCH 1/2] chore: Update `nixpkgs` in flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 64515b3..cfa82d0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "lastModified": 1772585379, + "narHash": "sha256-zomLtA51H/qXAcjczveQFXPi/GuJUkPdpDeyu5bGI4M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "rev": "0fd2db475afdde93c9e4b1625aafb8eb41b99807", "type": "github" }, "original": { From 5fac1d4d4f02567fb3318fbb16964f83dcad0172 Mon Sep 17 00:00:00 2001 From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Thu, 5 Mar 2026 01:19:45 +1100 Subject: [PATCH 2/2] biome: use schema output from biome --- programs/biome.nix | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/programs/biome.nix b/programs/biome.nix index 0c0766f..d48d878 100644 --- a/programs/biome.nix +++ b/programs/biome.nix @@ -14,19 +14,6 @@ let cfg = config.programs.biome; opts = options.programs.biome; - biomeVersion = - if builtins.match "^1\\." pkgs.biome.version != null then - "1.9.4" - else if builtins.match "^2\\.3\\." pkgs.biome.version != null then - "2.3.6" - else - "2.1.2"; - - schemaHashes = { - "1.9.4" = "sha256-SkkULLRk4CQzk+j0h8PAqOY6vGOrdG5ja7Z/tSAAKnY="; - "2.1.2" = "sha256-n4Y16J7g34e0VdQzRItu/P7n5oppkY4Vm4P1pQxOILU="; - "2.3.6" = "sha256-eBBUomh9qBkl47tp73vsgWeOPZdVVGR3CAQ5eBs8eNw="; - }; ext.js = [ "*.js" @@ -119,17 +106,11 @@ in type = t.path; description = "The biome schema file to validate against"; defaultText = l.literalMD '' - Fetches `"https://biomejs.dev/schemas/''${biomeVersion}/schema.json"` using `pkgs.fetchurl`. + Uses `${cfg.package}/share/schema.json` from the `programs.biome.package` output. ''; - default = p.fetchurl { - url = "https://biomejs.dev/schemas/${biomeVersion}/schema.json"; - hash = schemaHashes.${biomeVersion}; - }; + default = "${cfg.package}/share/schema.json"; example = l.literalExpression '' - pkgs.fetchurl { - url = "https://biomejs.dev/schemas/2.1.2/schema.json" - hash = "sha256-n4Y16J7g34e0VdQzRItu/P7n5oppkY4Vm4P1pQxOILU="; - } + ${pkgs.biome}/share/schema.json ''; }; }; @@ -149,7 +130,7 @@ in env = { json = jsonFile; schema = cfg.validate.schema; - schemaPath = cfg.validate.schema.url or (toString cfg.validate.schema); + schemaPath = toString cfg.validate.schema; }; } ''