From 368f163caa68ad392e45e225f6816d3a699aae8a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 30 May 2024 13:52:11 -0300 Subject: [PATCH] emacs: migrate build-support/emacs to applications/editors/emacs/build-support As a consequence of restrictions imposed by RFC 140 - Simple Package Paths [1] -, files related to a package should be confined on the package directory. Certainly this restriction does not apply to packages outside by-name hierarchy. Nonetheless, this is an interesting organization heuristics: things that affect Emacs should be confined inside Emacs directory. Besides a future migration, the "debuggability" of a framework is way more enhanced when we know how to find all its files. A similar task was done before, when RFC 140 was not a thging yet - namely, the migration of emacs-modes to elisp-packages [2]. [1] https://github.com/NixOS/rfcs/pull/140 [2] https://github.com/NixOS/nixpkgs/pull/123859 --- .../editors/emacs/build-support}/buffer.nix | 0 .../editors/emacs/build-support}/elpa.nix | 0 .../editors/emacs/build-support}/elpa2nix.el | 0 .../editors/emacs/build-support}/emacs-funcs.sh | 0 .../editors/emacs/build-support}/generic.nix | 0 .../editors/emacs/build-support}/melpa.nix | 0 .../editors/emacs/build-support}/melpa2nix.el | 0 .../editors/emacs/build-support}/mk-wrapper-subdirs.el | 0 .../emacs/build-support}/package-build-dont-use-mtime.patch | 0 .../editors/emacs/build-support}/trivial.nix | 0 .../editors/emacs/build-support}/wrapper.nix | 0 .../editors/emacs/build-support}/wrapper.sh | 0 .../editors/emacs/elisp-packages/elpa-devel-packages.nix | 2 +- .../editors/emacs/elisp-packages/elpa-packages.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ++++- pkgs/top-level/emacs-packages.nix | 6 +++--- 16 files changed, 9 insertions(+), 6 deletions(-) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/buffer.nix (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/elpa.nix (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/elpa2nix.el (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/emacs-funcs.sh (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/generic.nix (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/melpa.nix (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/melpa2nix.el (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/mk-wrapper-subdirs.el (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/package-build-dont-use-mtime.patch (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/trivial.nix (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/wrapper.nix (100%) rename pkgs/{build-support/emacs => applications/editors/emacs/build-support}/wrapper.sh (100%) diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/applications/editors/emacs/build-support/buffer.nix similarity index 100% rename from pkgs/build-support/emacs/buffer.nix rename to pkgs/applications/editors/emacs/build-support/buffer.nix diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix similarity index 100% rename from pkgs/build-support/emacs/elpa.nix rename to pkgs/applications/editors/emacs/build-support/elpa.nix diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el similarity index 100% rename from pkgs/build-support/emacs/elpa2nix.el rename to pkgs/applications/editors/emacs/build-support/elpa2nix.el diff --git a/pkgs/build-support/emacs/emacs-funcs.sh b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh similarity index 100% rename from pkgs/build-support/emacs/emacs-funcs.sh rename to pkgs/applications/editors/emacs/build-support/emacs-funcs.sh diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix similarity index 100% rename from pkgs/build-support/emacs/generic.nix rename to pkgs/applications/editors/emacs/build-support/generic.nix diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix similarity index 100% rename from pkgs/build-support/emacs/melpa.nix rename to pkgs/applications/editors/emacs/build-support/melpa.nix diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/applications/editors/emacs/build-support/melpa2nix.el similarity index 100% rename from pkgs/build-support/emacs/melpa2nix.el rename to pkgs/applications/editors/emacs/build-support/melpa2nix.el diff --git a/pkgs/build-support/emacs/mk-wrapper-subdirs.el b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el similarity index 100% rename from pkgs/build-support/emacs/mk-wrapper-subdirs.el rename to pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch similarity index 100% rename from pkgs/build-support/emacs/package-build-dont-use-mtime.patch rename to pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix similarity index 100% rename from pkgs/build-support/emacs/trivial.nix rename to pkgs/applications/editors/emacs/build-support/trivial.nix diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix similarity index 100% rename from pkgs/build-support/emacs/wrapper.nix rename to pkgs/applications/editors/emacs/build-support/wrapper.nix diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh similarity index 100% rename from pkgs/build-support/emacs/wrapper.sh rename to pkgs/applications/editors/emacs/build-support/wrapper.sh diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 192320fab674..f02b98e5f22d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -32,7 +32,7 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { + elpaBuild = import ../build-support/elpa.nix { inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3e8ab4625fec..4f3bdc44eb61 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -32,7 +32,7 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { + elpaBuild = import ../build-support/elpa.nix { inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13e3e0892afe..bcc500c81c12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1288,7 +1288,10 @@ with pkgs; mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; + nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix { + inherit lib writeText; + inherit (emacs.pkgs) inherit-local; + }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a14f53d53528..383ba5d73008 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -47,7 +47,7 @@ let inherit lib pkgs; }; - emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../build-support/emacs/wrapper.nix { + emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../applications/editors/emacs/build-support/wrapper.nix { inherit (pkgs.xorg) lndir; inherit lib; }; @@ -77,11 +77,11 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ }; }); - trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix { + trivialBuild = pkgs.callPackage ../applications/editors/emacs/build-support/trivial.nix { inherit (self) emacs; }; - melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix { + melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix { inherit (self) emacs; };