diff --git a/flake.lock b/flake.lock index cc06f239b6..37018770ff 100644 --- a/flake.lock +++ b/flake.lock @@ -394,6 +394,23 @@ "type": "github" } }, + "oxlint": { + "flake": false, + "locked": { + "lastModified": 1706279735, + "narHash": "sha256-J4QDhb3C4ioJyD3345hyNRHsGyiJWuCxZ77auCg8joQ=", + "owner": "web-infra-dev", + "repo": "oxc", + "rev": "1b5bbb954c53b0461c2e1eebe56d8a1e60d745e7", + "type": "github" + }, + "original": { + "owner": "web-infra-dev", + "ref": "oxlint_v0.2.6", + "repo": "oxc", + "type": "github" + } + }, "root": { "inputs": { "arion": "arion", @@ -411,6 +428,7 @@ "nixpkgs": "nixpkgs", "nixpkgs-go": "nixpkgs-go", "nixpkgs-solc": "nixpkgs-solc", + "oxlint": "oxlint", "rust-overlay": "rust-overlay_2", "treefmt-nix": "treefmt-nix", "v0_14_0": "v0_14_0", diff --git a/flake.nix b/flake.nix index 2c8d0abe04..4cf156d3ca 100644 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,10 @@ url = "github:CosmWasm/wasmvm/v1.5.0"; flake = false; }; + oxlint = { + url = "github:web-infra-dev/oxc/oxlint_v0.2.6"; + flake = false; + }; # uniond versions v0_14_0 = { diff --git a/tools/oxlint/oxlint.nix b/tools/oxlint/oxlint.nix index b1ffcbb56c..38db3f62d8 100644 --- a/tools/oxlint/oxlint.nix +++ b/tools/oxlint/oxlint.nix @@ -1,14 +1,9 @@ -{ ... }: { +{ inputs, ... }: { perSystem = { pkgs, crane, ... }: { _module.args.oxlint = crane.lib.buildPackage rec { - name = "oxlint"; + pname = "oxlint"; version = "0.2.6"; - src = pkgs.fetchFromGitHub { - owner = "web-infra-dev"; - repo = "oxc"; - rev = "oxlint_v${version}"; - hash = "sha256-yjF8/oJ4GsCLk2qt1ssJ9KVMO18XsM70EnS6LMZQY3I="; - }; + src = inputs.oxlint; buildInputs = [ pkgs.jemalloc ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [