From 2c61820661e1633d4be0a090bdd3332988fb8272 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 24 Apr 2022 00:11:50 +1200 Subject: [PATCH] emacs.pkgs.tsc/tree-sitter-langs: Remove `rec` from derivations These are not required. --- .../emacs/elisp-packages/tree-sitter-langs/default.nix | 10 ++++++---- .../editors/emacs/elisp-packages/tsc/default.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix index 1dbcf605adf9..ffc3f5337496 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix @@ -10,14 +10,15 @@ let version = "0.10.14"; - tree-sitter-grammars = stdenv.mkDerivation rec { + + tree-sitter-grammars = stdenv.mkDerivation { name = "tree-sitter-grammars"; inherit version; - src = fetchzip { + src = fetchzip rec { name = "tree-sitter-grammars-linux-${version}.tar.gz"; - url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/${src.name}"; + url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/${name}"; sha256 = "sha256-J8VplZWhyWN8ur74Ep0CTl4nPtESzfs2Gh6MxfY5Zqc="; stripRoot = false; }; @@ -28,7 +29,8 @@ let install -m444 * $out/langs/bin ''; }; -in melpaBuild rec { + +in melpaBuild { inherit version; pname = "tree-sitter-langs"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix index 3f686f96febe..dcb950824d0d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix @@ -18,7 +18,7 @@ let sha256 = "sha256-tAohHdAsy/HTFFPSNOo0UyrdolH8h0KF2ekFXuLltBE="; }; - tsc = melpaBuild rec { + tsc = melpaBuild { inherit src; inherit version;