diff --git a/nix/packages/tokei/default.nix b/nix/packages/tokei/default.nix index 3e69a481..19c1c007 100644 --- a/nix/packages/tokei/default.nix +++ b/nix/packages/tokei/default.nix @@ -7,23 +7,22 @@ darwin, zlib, }: let - rev = "6392516c47d4573d16886b9fe5f79592b1c70d49"; + rev = "v13.0.0-alpha.8"; in rustPlatform.buildRustPackage { pname = "tokei"; - version = lib.substring 0 7 rev; + version = rev; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = "tokei"; inherit rev; - hash = "sha256-EYr4K1Bt+74jb85UQ3So0efrOcYAq71/4++kMCSPi1E="; + hash = "sha256-jCI9VM3y76RI65E5UGuAPuPkDRTMyi+ydx64JWHcGfE="; }; - cargoHash = "sha256-fdAJwQNJczRqy0KQqse8QRx5+1gZTCBw+kkwgn6UGKU="; + cargoHash = "sha256-XvRO5AbPYZVRVxqFmKf2Xn4K9VvZyb3eyJLu/cGrPdI="; patches = [ - ./hledger.patch ./skel.patch ./why3.patch ]; diff --git a/nix/packages/tokei/hledger.patch b/nix/packages/tokei/hledger.patch deleted file mode 100644 index f5d6897a..00000000 --- a/nix/packages/tokei/hledger.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/languages.json b/languages.json -index ac548b9..b2899f1 100644 ---- a/languages.json -+++ b/languages.json -@@ -846,6 +846,13 @@ - "nested": true, - "extensions": ["lean", "hlean"] - }, -+ "Hledger": { -+ "name": "hledger", -+ "line_comment": [";", "#"], -+ "multi_line_comments": [["comment", "end comment"]], -+ "nested": false, -+ "extensions": ["hledger"] -+ }, - "Less": { - "name": "LESS", - "line_comment": ["//"], -diff --git a/tests/data/hledger.hledger b/tests/data/hledger.hledger -new file mode 100644 -index 0000000..df7259d ---- /dev/null -+++ b/tests/data/hledger.hledger -@@ -0,0 +1,18 @@ -+# 18 lines 6 code 10 comments 2 blanks -+# a comment -+; another comment -+ -+; ^ a blank line -+comment -+account assets ; Declare valid account names and display order. -+a block comment -+end comment -+ -+account assets:savings ; A subaccount. This one represents a bank account. -+account assets:checking ; Another. Note, 2+ spaces after the account name. -+account assets:receivable ; Accounting type is inferred from english names, -+account passifs ; or declared with a "type" tag, type:L -+account expenses ; type:X -+ ; A follow-on comment line, indented. -+account expenses:rent ; Expense and revenue categories are also accounts. -+ ; Subaccounts inherit their parent's type.