From 457efcd3520907e5d1a304632fd308558359958e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 12 Nov 2022 11:25:08 -0300 Subject: [PATCH 1/7] emacs.pkgs.elisp-ffi: move to a dedicated directory There is no tangible reason to pollute a file like manual-packages with full descriptions of expressions. `callPackage` exists for a reason :) --- .../elisp-packages/elisp-ffi/default.nix | 47 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 42 +---------------- 2 files changed, 48 insertions(+), 41 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/elisp-ffi/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/elisp-ffi/default.nix new file mode 100644 index 000000000000..74b829701b0b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/elisp-ffi/default.nix @@ -0,0 +1,47 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, pkg-config +, libffi +, writeText +}: + +let + rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; +in melpaBuild { + pname = "elisp-ffi"; + version = "20170518.0"; + + commit = rev; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = "elisp-ffi"; + inherit rev; + sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libffi ]; + + preBuild = '' + mv ffi.el elisp-ffi.el + make + ''; + + recipe = writeText "recipe" '' + (elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github) + ''; + + meta = { + description = "Emacs Lisp Foreign Function Interface"; + longDescription = '' + This library provides an FFI for Emacs Lisp so that Emacs + programs can invoke functions in native libraries. It works by + driving a subprocess to do the heavy lifting, passing result + values on to Emacs. + ''; + license = lib.licenses.publicDomain; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 0a6f581411e5..64f81c97250d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -2,47 +2,7 @@ self: with self; { - elisp-ffi = let - rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; - in melpaBuild { - pname = "elisp-ffi"; - version = "20170518.0"; - - commit = rev; - - src = pkgs.fetchFromGitHub { - owner = "skeeto"; - repo = "elisp-ffi"; - inherit rev; - sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; - }; - - nativeBuildInputs = [ pkgs.pkg-config ]; - - buildInputs = [ pkgs.libffi ]; - - preBuild = '' - mv ffi.el elisp-ffi.el - make - ''; - - recipe = pkgs.writeText "recipe" '' - (elisp-ffi - :repo "skeeto/elisp-ffi" - :fetcher github) - ''; - - meta = { - description = "Emacs Lisp Foreign Function Interface"; - longDescription = '' - This library provides an FFI for Emacs Lisp so that Emacs - programs can invoke functions in native libraries. It works by - driving a subprocess to do the heavy lifting, passing result - values on to Emacs. - ''; - license = lib.licenses.publicDomain; - }; - }; + elisp-ffi = callPackage ./elisp-ffi { }; ghc-mod = melpaBuild { pname = "ghc"; From 96b0956aeefa40741b65dcf5d57deb741ec3bba0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 12 Nov 2022 14:00:37 -0300 Subject: [PATCH 2/7] emacs.pkgs.ghc-mod: move to a dedicated directory There is no tangible reason to pollute a file like manual-packages with full descriptions of expressions. `callPackage` exists for a reason :) --- .../emacs/elisp-packages/ghc-mod/default.nix | 27 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 22 +-------------- 2 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/ghc-mod/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ghc-mod/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ghc-mod/default.nix new file mode 100644 index 000000000000..533c63608ab7 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/ghc-mod/default.nix @@ -0,0 +1,27 @@ +{ lib +, pkgs +, melpaBuild +, haskellPackages +, writeText +}: + +melpaBuild { + pname = "ghc"; + + inherit (haskellPackages.ghc-mod) version src; + + packageRequires = [ haskell-mode ]; + + propagatedUserEnvPkgs = [ haskellPackages.ghc-mod ]; + + recipe = writeText "recipe" '' + (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) + ''; + + fileSpecs = [ "elisp/*.el" ]; + + meta = { + description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 64f81c97250d..b0dda76987e8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -4,27 +4,7 @@ self: with self; { elisp-ffi = callPackage ./elisp-ffi { }; - ghc-mod = melpaBuild { - pname = "ghc"; - version = pkgs.haskellPackages.ghc-mod.version; - - src = pkgs.haskellPackages.ghc-mod.src; - - packageRequires = [ haskell-mode ]; - - propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ]; - - recipe = pkgs.writeText "recipe" '' - (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) - ''; - - fileSpecs = [ "elisp/*.el" ]; - - meta = { - description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; - license = lib.licenses.bsd3; - }; - }; + ghc-mod = callPackage ./elisp-ffi { }; haskell-unicode-input-method = let rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; From 022ffab437d64bd9469a323ca4a9aeec3af3fdf4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 12 Nov 2022 14:07:16 -0300 Subject: [PATCH 3/7] emacs.pkgs.haskell-unicode-input-method: move to a dedicated directory There is no tangible reason to pollute a file like manual-packages with full descriptions of expressions. `callPackage` exists for a reason :) --- .../haskell-unicode-input-method/default.nix | 34 +++++++++++++++++++ .../emacs/elisp-packages/manual-packages.nix | 29 +--------------- 2 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/haskell-unicode-input-method/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/haskell-unicode-input-method/default.nix b/pkgs/applications/editors/emacs/elisp-packages/haskell-unicode-input-method/default.nix new file mode 100644 index 000000000000..1d9fa6a0c084 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/haskell-unicode-input-method/default.nix @@ -0,0 +1,34 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, writeText +}: + +let + rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; +in melpaBuild { + pname = "haskell-unicode-input-method"; + version = "20110905.2307"; + + commit = rev; + + src = fetchFromGitHub { + owner = "roelvandijk"; + repo = "emacs-haskell-unicode-input-method"; + inherit rev; + sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; + }; + + recipe = writeText "recipe" '' + (haskell-unicode-input-method + :repo "roelvandijk/emacs-haskell-unicode-input-method" + :fetcher github) + ''; + + packageRequires = []; + + meta = { + homepage = "https://melpa.org/#haskell-unicode-input-method/"; + license = lib.licenses.free; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index b0dda76987e8..2bc0042d860b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -6,34 +6,7 @@ self: with self; { ghc-mod = callPackage ./elisp-ffi { }; - haskell-unicode-input-method = let - rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; - in melpaBuild { - pname = "haskell-unicode-input-method"; - version = "20110905.2307"; - - commit = rev; - - src = pkgs.fetchFromGitHub { - owner = "roelvandijk"; - repo = "emacs-haskell-unicode-input-method"; - inherit rev; - sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; - }; - - recipe = pkgs.writeText "recipe" '' - (haskell-unicode-input-method - :repo "roelvandijk/emacs-haskell-unicode-input-method" - :fetcher github) - ''; - - packageRequires = []; - - meta = { - homepage = "https://melpa.org/#haskell-unicode-input-method/"; - license = lib.licenses.free; - }; - }; + haskell-unicode-input-method = callPackage ./haskell-unicode-input-method { }; matrix-client = let rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; From d19c5a23845a22df1da778c41c501b42438dc0f8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 12 Nov 2022 17:27:23 -0300 Subject: [PATCH 4/7] emacs.pkgs.matrix-client: move to a dedicated directory There is no tangible reason to pollute a file like manual-packages with full descriptions of expressions. `callPackage` exists for a reason :) --- .../emacs/elisp-packages/manual-packages.nix | 55 +------------- .../elisp-packages/matrix-client/default.nix | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+), 54 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/matrix-client/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 2bc0042d860b..fc7d9a8f7cd5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -8,60 +8,7 @@ self: with self; { haskell-unicode-input-method = callPackage ./haskell-unicode-input-method { }; - matrix-client = let - rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; - in melpaBuild - { - pname = "matrix-client"; - version = "0.3.0"; - - commit = rev; - - src = pkgs.fetchFromGitHub { - owner = "alphapapa"; - repo = "matrix-client.el"; - inherit rev; - sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq"; - }; - - patches = [ - # Fix: avatar loading when imagemagick support is not available - (pkgs.fetchpatch { - url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; - sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm"; - }) - ]; - - packageRequires = [ - anaphora - cl-lib - self.map - dash-functional - esxml - f - ov - tracking - rainbow-identifiers - dash - s - request - frame-purpose - a - ht - ]; - - recipe = pkgs.writeText "recipe" '' - (matrix-client - :repo "alphapapa/matrix-client.el" - :fetcher github) - ''; - - meta = { - description = "A chat client and API wrapper for Matrix.org"; - license = lib.licenses.gpl3Plus; - }; - - }; + matrix-client = callPackage ./matrix-client { _map = self.map; }; prisma-mode = let rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/matrix-client/default.nix b/pkgs/applications/editors/emacs/elisp-packages/matrix-client/default.nix new file mode 100644 index 000000000000..d8efbb9e9cb3 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/matrix-client/default.nix @@ -0,0 +1,73 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, fetchpatch +, writeText +# Emacs packages +, _map +, a +, anaphora +, cl-lib +, dash +, dash-functional +, esxml +, f +, frame-purpose +, ht +, ov +, rainbow-identifiers +, request +, s +, tracking +}: + +let + rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; +in melpaBuild { + pname = "matrix-client"; + version = "0.3.0"; + + commit = rev; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "matrix-client.el"; + inherit rev; + sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq"; + }; + + patches = [ + # Fix: avatar loading when imagemagick support is not available + (fetchpatch { + url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; + sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm"; + }) + ]; + + packageRequires = [ + _map + a + anaphora + cl-lib + dash + dash-functional + esxml + f + frame-purpose + ht + ov + rainbow-identifiers + request + s + tracking + ]; + + recipe = writeText "recipe" '' + (matrix-client :repo "alphapapa/matrix-client.el" :fetcher github) + ''; + + meta = { + description = "A chat client and API wrapper for Matrix.org"; + license = lib.licenses.gpl3Plus; + }; +} From c47cbf3acaff10179b418c216bb5e6e1cd63c2c4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 12 Nov 2022 15:21:12 -0300 Subject: [PATCH 5/7] emacs.pkgs.prisma-mode: move to a dedicated directory There is no tangible reason to pollute a file like manual-packages with full descriptions of expressions. `callPackage` exists for a reason :) --- .../emacs/elisp-packages/manual-packages.nix | 29 +--------------- .../elisp-packages/prisma-mode/default.nix | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/prisma-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index fc7d9a8f7cd5..4af76153af86 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -10,34 +10,7 @@ self: with self; { matrix-client = callPackage ./matrix-client { _map = self.map; }; - prisma-mode = let - rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; - in melpaBuild { - pname = "prisma-mode"; - version = "20211207.0"; - - commit = rev; - - packageRequires = [ js2-mode ]; - - src = pkgs.fetchFromGitHub { - owner = "pimeys"; - repo = "emacs-prisma-mode"; - inherit rev; - sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; - }; - - recipe = pkgs.writeText "recipe" '' - (prisma-mode - :repo "pimeys/emacs-prisma-mode" - :fetcher github) - ''; - - meta = { - description = "Major mode for Prisma Schema Language"; - license = lib.licenses.gpl2Only; - }; - }; + prisma-mode = callPackage ./prisma-mode { }; agda-input = callPackage ./agda-input { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/prisma-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/prisma-mode/default.nix new file mode 100644 index 000000000000..983363ae838f --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/prisma-mode/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, melpaBuild +, js2-mode +, writeText +}: + +let + rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; +in melpaBuild { + pname = "prisma-mode"; + version = "20211207.0"; + + commit = rev; + + packageRequires = [ js2-mode ]; + + src = fetchFromGitHub { + owner = "pimeys"; + repo = "emacs-prisma-mode"; + inherit rev; + sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; + }; + + recipe = writeText "recipe" '' + (prisma-mode :repo "pimeys/emacs-prisma-mode" :fetcher github) + ''; + + meta = { + description = "Major mode for Prisma Schema Language"; + license = lib.licenses.gpl2Only; + }; +} From 03fa9cdde9bf21ed7f518193d60f131cd254856d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 12 Nov 2022 17:29:15 -0300 Subject: [PATCH 6/7] treewide: move all ad-hoc elisp packages to manual-packages/ --- .../emacs/elisp-packages/manual-packages.nix | 89 ++++++++++--------- .../agda-input/default.nix | 0 .../agda2-mode/default.nix | 0 .../bqn-mode/default.nix | 0 .../{ => manual-packages}/cask/default.nix | 0 .../{ => manual-packages}/cedille/default.nix | 0 .../color-theme-solarized/default.nix | 0 .../control-lock/default.nix | 0 .../ebuild-mode/default.nix | 0 .../elisp-ffi/default.nix | 0 .../emacspeak/default.nix | 0 .../{ => manual-packages}/ement/default.nix | 0 .../ement/handle-nil-images.patch | 0 .../ess-R-object-popup/default.nix | 0 .../evil-markdown/default.nix | 0 .../font-lock-plus/default.nix | 0 .../{ => manual-packages}/ghc-mod/default.nix | 0 .../git-undo/default.nix | 0 .../haskell-unicode-input-method/default.nix | 0 .../header-file-mode/default.nix | 0 .../helm-words/default.nix | 0 .../{ => manual-packages}/hsc3/default.nix | 0 .../idris2-mode/default.nix | 0 .../isearch-plus/default.nix | 0 .../isearch-prop/default.nix | 0 .../jam-mode/default.nix | 0 .../llvm-mode/default.nix | 0 .../matrix-client/default.nix | 0 .../nano-theme/default.nix | 0 .../ott-mode/default.nix | 0 .../perl-completion/default.nix | 0 .../pod-mode/default.nix | 0 .../power-mode/default.nix | 0 .../prisma-mode/default.nix | 0 .../{ => manual-packages}/prolog/default.nix | 0 .../rect-mark/default.nix | 0 .../session-management-for-emacs/default.nix | 0 .../sunrise-commander/default.nix | 0 .../sv-kalender/default.nix | 0 .../tree-sitter-langs/default-grammars.json | 0 .../tree-sitter-langs/default.nix | 0 .../tree-sitter-langs/update-defaults.py | 0 .../{ => manual-packages}/tsc/default.nix | 0 .../{ => manual-packages}/tsc/src.json | 0 .../{ => manual-packages}/tsc/update.py | 0 .../urweb-mode/default.nix | 0 .../voicemacs/add-missing-require.patch | 0 .../voicemacs/default.nix | 0 .../{ => manual-packages}/yes-no/default.nix | 0 .../youtube-dl/default.nix | 0 50 files changed, 45 insertions(+), 44 deletions(-) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/agda-input/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/agda2-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/bqn-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/cask/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/cedille/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/color-theme-solarized/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/control-lock/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/ebuild-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/elisp-ffi/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/emacspeak/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/ement/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/ement/handle-nil-images.patch (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/ess-R-object-popup/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/evil-markdown/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/font-lock-plus/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/ghc-mod/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/git-undo/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/haskell-unicode-input-method/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/header-file-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/helm-words/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/hsc3/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/idris2-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/isearch-plus/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/isearch-prop/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/jam-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/llvm-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/matrix-client/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/nano-theme/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/ott-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/perl-completion/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/pod-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/power-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/prisma-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/prolog/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/rect-mark/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/session-management-for-emacs/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/sunrise-commander/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/sv-kalender/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/tree-sitter-langs/default-grammars.json (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/tree-sitter-langs/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/tree-sitter-langs/update-defaults.py (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/tsc/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/tsc/src.json (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/tsc/update.py (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/urweb-mode/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/voicemacs/add-missing-require.patch (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/voicemacs/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/yes-no/default.nix (100%) rename pkgs/applications/editors/emacs/elisp-packages/{ => manual-packages}/youtube-dl/default.nix (100%) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 4af76153af86..98e1b37171fa 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -2,93 +2,94 @@ self: with self; { - elisp-ffi = callPackage ./elisp-ffi { }; + agda-input = callPackage ./manual-packages/agda-input { }; - ghc-mod = callPackage ./elisp-ffi { }; + agda2-mode = callPackage ./manual-packages/agda2-mode { }; - haskell-unicode-input-method = callPackage ./haskell-unicode-input-method { }; + bqn-mode = callPackage ./manual-packages/bqn-mode { }; - matrix-client = callPackage ./matrix-client { _map = self.map; }; + cask = callPackage ./manual-packages/cask { }; - prisma-mode = callPackage ./prisma-mode { }; + control-lock = callPackage ./manual-packages/control-lock { }; - agda-input = callPackage ./agda-input { }; + ebuild-mode = callPackage ./manual-packages/ebuild-mode { }; - agda2-mode = callPackage ./agda2-mode { }; + elisp-ffi = callPackage ./manual-packages/elisp-ffi { }; - bqn-mode = callPackage ./bqn-mode { }; + emacspeak = callPackage ./manual-packages/emacspeak { }; - cask = callPackage ./cask { }; + ement = callPackage ./manual-packages/ement { }; - control-lock = callPackage ./control-lock { }; + ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { }; - ebuild-mode = callPackage ./ebuild-mode { }; + evil-markdown = callPackage ./manual-packages/evil-markdown { }; - emacspeak = callPackage ./emacspeak { }; + font-lock-plus = callPackage ./manual-packages/font-lock-plus { }; - ement = callPackage ./ement { }; + ghc-mod = callPackage ./manual-packages/elisp-ffi { }; - ess-R-object-popup = callPackage ./ess-R-object-popup { }; + git-undo = callPackage ./manual-packages/git-undo { }; - evil-markdown = callPackage ./evil-markdown { }; + haskell-unicode-input-method = callPackage ./manual-packages/haskell-unicode-input-method { }; - font-lock-plus = callPackage ./font-lock-plus { }; + header-file-mode = callPackage ./manual-packages/header-file-mode { }; - git-undo = callPackage ./git-undo { }; + helm-words = callPackage ./manual-packages/helm-words { }; - header-file-mode = callPackage ./header-file-mode { }; + idris2-mode = callPackage ./manual-packages/idris2-mode { }; - helm-words = callPackage ./helm-words { }; + isearch-plus = callPackage ./manual-packages/isearch-plus { }; - idris2-mode = callPackage ./idris2-mode { }; + isearch-prop = callPackage ./manual-packages/isearch-prop { }; - isearch-plus = callPackage ./isearch-plus { }; + jam-mode = callPackage ./manual-packages/jam-mode { }; - isearch-prop = callPackage ./isearch-prop { }; + llvm-mode = callPackage ./manual-packages/llvm-mode { }; - jam-mode = callPackage ./jam-mode { }; + matrix-client = callPackage ./manual-packages/matrix-client { + _map = self.map; + }; - llvm-mode = callPackage ./llvm-mode { }; + nano-theme = callPackage ./manual-packages/nano-theme { }; - nano-theme = callPackage ./nano-theme { }; + ott-mode = callPackage ./manual-packages/ott-mode { }; - ott-mode = callPackage ./ott-mode { }; + perl-completion = callPackage ./manual-packages/perl-completion { }; - perl-completion = callPackage ./perl-completion { }; + pod-mode = callPackage ./manual-packages/pod-mode { }; - pod-mode = callPackage ./pod-mode { }; + power-mode = callPackage ./manual-packages/power-mode { }; - power-mode = callPackage ./power-mode { }; + prisma-mode = callPackage ./manual-packages/prisma-mode { }; structured-haskell-mode = self.shm; - sv-kalender = callPackage ./sv-kalender { }; + sv-kalender = callPackage ./manual-packages/sv-kalender { }; - tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; }; + tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; }; - tsc = callPackage ./tsc { }; + tsc = callPackage ./manual-packages/tsc { }; - urweb-mode = callPackage ./urweb-mode { }; + urweb-mode = callPackage ./manual-packages/urweb-mode { }; - voicemacs = callPackage ./voicemacs { }; + voicemacs = callPackage ./manual-packages/voicemacs { }; - yes-no = callPackage ./yes-no { }; + yes-no = callPackage ./manual-packages/yes-no { }; - youtube-dl = callPackage ./youtube-dl { }; + youtube-dl = callPackage ./manual-packages/youtube-dl { }; # From old emacsPackages (pre emacsPackagesNg) - cedille = callPackage ./cedille { cedille = pkgs.cedille; }; - color-theme-solarized = callPackage ./color-theme-solarized { }; - session-management-for-emacs = callPackage ./session-management-for-emacs { }; - hsc3-mode = callPackage ./hsc3 { }; - prolog-mode = callPackage ./prolog { }; - rect-mark = callPackage ./rect-mark { }; - sunrise-commander = callPackage ./sunrise-commander { }; + cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; }; + color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { }; + hsc3-mode = callPackage ./manual-packages/hsc3 { }; + prolog-mode = callPackage ./manual-packages/prolog { }; + rect-mark = callPackage ./manual-packages/rect-mark { }; + session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { }; + sunrise-commander = callPackage ./manual-packages/sunrise-commander { }; # camelCase aliases for some of the kebab-case expressions above colorThemeSolarized = color-theme-solarized; emacsSessionManagement = session-management-for-emacs; rectMark = rect-mark; sunriseCommander = sunrise-commander; - } diff --git a/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda-input/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda-input/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/cask/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/cask/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cedille/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/cedille/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/control-lock/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/elisp-ffi/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/ement/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ghc-mod/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghc-mod/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/ghc-mod/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghc-mod/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/haskell-unicode-input-method/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/haskell-unicode-input-method/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/haskell-unicode-input-method/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/haskell-unicode-input-method/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/header-file-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/header-file-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/header-file-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/hsc3/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/hsc3/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/idris2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/idris2-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/llvm-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/llvm-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/matrix-client/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/matrix-client/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/nano-theme/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/nano-theme/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/pod-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/pod-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/power-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/prisma-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/prisma-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default-grammars.json similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default-grammars.json rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default-grammars.json diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/tree-sitter-langs/update-defaults.py rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/tsc/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/src.json b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/tsc/src.json rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json diff --git a/pkgs/applications/editors/emacs/elisp-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/tsc/update.py rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py diff --git a/pkgs/applications/editors/emacs/elisp-packages/urweb-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/urweb-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/voicemacs/add-missing-require.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/voicemacs/add-missing-require.patch rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch diff --git a/pkgs/applications/editors/emacs/elisp-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/voicemacs/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix From fed3699eb5255e662898db1ca2131aecf968a0db Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Nov 2022 09:13:14 -0300 Subject: [PATCH 7/7] tree-sitter-langs: fixup update-defaults.py The nix-shell line should always point out to the repo's `default.nix`. --- .../manual-packages/tree-sitter-langs/update-defaults.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py index 19bcb8989c30..128ce66dda8b 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell -#! nix-shell ../../../../../../. -i python3 -p python3 -p nix +#! nix-shell ../../../../../../../. -i python3 -p python3 -p nix + from os.path import ( dirname, abspath,