diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/by-name/tr/tree-sitter-yts/package.nix | 59 | ||||
| -rw-r--r-- | pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix (renamed from modules/home.legacy/conf/beets/plugins/play/default.nix) | 22 |
2 files changed, 11 insertions, 70 deletions
diff --git a/pkgs/by-name/tr/tree-sitter-yts/package.nix b/pkgs/by-name/tr/tree-sitter-yts/package.nix deleted file mode 100644 index 62ecf063..00000000 --- a/pkgs/by-name/tr/tree-sitter-yts/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de> -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. -# taken from nixpgks: pkgs/development/tools/parsing/tree-sitter/grammar.nix -{ - yt, - stdenv, - nodejs, - tree-sitter, -}: -stdenv.mkDerivation { - pname = "yts-grammar"; - version = "1.0.0"; - - inherit (yt) src; - sourceRoot = "yt/tree-sitter-yts"; - - nativeBuildInputs = [nodejs tree-sitter]; - - CFLAGS = ["-Isrc" "-O2"]; - CXXFLAGS = ["-Isrc" "-O2"]; - - stripDebugList = ["parser"]; - - configurePhase = '' - tree-sitter generate - ''; - - # When both scanner.{c,cc} exist, we should not link both since they may be the same but in - # different languages. Just randomly prefer C++ if that happens. - buildPhase = '' - runHook preBuild - if [[ -e src/scanner.cc ]]; then - $CXX -fPIC -c src/scanner.cc -o scanner.o $CXXFLAGS - elif [[ -e src/scanner.c ]]; then - $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS - fi - $CC -fPIC -c src/parser.c -o parser.o $CFLAGS - rm -rf parser - $CXX -shared -o parser *.o - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir $out - mv parser $out/ - if [[ -d queries ]]; then - cp -r queries $out - fi - runHook postInstall - ''; -} diff --git a/modules/home.legacy/conf/beets/plugins/play/default.nix b/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix index 9d26f16a..eef65714 100644 --- a/modules/home.legacy/conf/beets/plugins/play/default.nix +++ b/pkgs/by-name/tr/tree-sitter-yts/package.unstable.nix @@ -7,17 +7,17 @@ # # You should have received a copy of the License along with this program. # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. +# taken from nixpgks: pkgs/development/tools/parsing/tree-sitter/grammar.nix { - lib, - pkgs, - config, - ... -}: { - programs.beets.settings.play = { - command = "${lib.getExe pkgs.mpc} $args add"; - relative_to = config.services.mpd.musicDirectory; + yt, + stdenv, + nodejs, + tree-sitter, +}: +tree-sitter.buildGrammar { + language = "yts"; + version = "0.0.1+rev=0bb9a60"; - # Run the command with the returned paths as arguments - raw = true; - }; + inherit (yt) src; + sourceRoot = "yt/tree-sitter-yts"; } |
