From d0fdbc5f34a556a5b06e7ccc2f6288eac2ec51ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 28 Jul 2025 17:35:48 +0200 Subject: [PATCH] packages/tokei: remove custom language patches --- nix/packages/by-name/tokei/package.nix | 5 ---- nix/packages/by-name/tokei/skel.patch | 32 -------------------------- nix/packages/by-name/tokei/why3.patch | 30 ------------------------ 3 files changed, 67 deletions(-) delete mode 100644 nix/packages/by-name/tokei/skel.patch delete mode 100644 nix/packages/by-name/tokei/why3.patch diff --git a/nix/packages/by-name/tokei/package.nix b/nix/packages/by-name/tokei/package.nix index 3364c990..fbaee2fc 100644 --- a/nix/packages/by-name/tokei/package.nix +++ b/nix/packages/by-name/tokei/package.nix @@ -23,11 +23,6 @@ in { cargoLock.lockFile = cargoLock; - patches = [ - ./skel.patch - ./why3.patch - ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.Security diff --git a/nix/packages/by-name/tokei/skel.patch b/nix/packages/by-name/tokei/skel.patch deleted file mode 100644 index d375facb..00000000 --- a/nix/packages/by-name/tokei/skel.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/languages.json b/languages.json -index b2899f1..dfeff47 100644 ---- a/languages.json -+++ b/languages.json -@@ -1406,6 +1406,10 @@ - "quotes": [["\\\"", "\\\""]], - "extensions": ["shader", "cginc"] - }, -+ "Skel": { -+ "multi_line_comments": [["(*", "*)"]], -+ "extensions": ["skel", "sk"] -+ }, - "Slang": { - "name": "Slang", - "line_comment": ["//"], -diff --git a/tests/data/skel.sk b/tests/data/skel.sk -new file mode 100644 -index 0000000..c6e8a68 ---- /dev/null -+++ b/tests/data/skel.sk -@@ -0,0 +1,11 @@ -+(* 11 lines 5 code 5 comments 1 blanks *) -+ -+(* ^ a blank line, a comment *) -+(* -+a multiline comment -+*) -+type ident -+type term = -+| Var ident -+| Lam (ident, term) -+| App (term, term) diff --git a/nix/packages/by-name/tokei/why3.patch b/nix/packages/by-name/tokei/why3.patch deleted file mode 100644 index c7cee2bb..00000000 --- a/nix/packages/by-name/tokei/why3.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/languages.json b/languages.json -index dfeff47..0baedb7 100644 ---- a/languages.json -+++ b/languages.json -@@ -1742,6 +1742,12 @@ - "line_comment": ["//"], - "extensions": ["wgsl"] - }, -+ "Why3": { -+ "name": "Why3", -+ "quotes": [["\\\"", "\\\""]], -+ "multi_line_comments": [["(*", "*)"]], -+ "extensions": ["mlw"] -+ }, - "Wolfram": { - "quotes": [["\\\"", "\\\""]], - "multi_line_comments": [["(*", "*)"]], -diff --git a/tests/data/why3.mlw b/tests/data/why3.mlw -new file mode 100644 -index 0000000..0d07bb2 ---- /dev/null -+++ b/tests/data/why3.mlw -@@ -0,0 +1,7 @@ -+(* 7 lines 3 code 3 comments 1 blanks *) -+module Exercice3 -+ (* ^ ligne vide *) -+ -+ val foo (bar) : baz -+ (* commentaire *) -+end