emacs-packages: split git-rebase from magit, deprecate git-rebase-mode

magit doesn't depend on git-rebase, git-rebase depends on magit

1 files changed, 12 insertions, 2 deletions

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index caa0d07ead6d..7fcc5c66ce3a 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -792,6 +792,7 @@ let self = _self // overrides;
 
   #TODO git-gutter-fringe
 
+  # Deprecated in favor of git-rebase
   git-rebase-mode = melpaBuild rec {
     pname = "git-rebase-mode";
     version = "1.0.0";
@@ -802,7 +803,7 @@ let self = _self // overrides;
       sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
     };
     files = [ "git-rebase-mode.el" ];
-    meta = { license = gpl3Plus; };
+    meta = git-rebase.meta;
   };
 
   git-timemachine = melpaBuild rec {
@@ -1172,7 +1173,6 @@ let self = _self // overrides;
                   "lisp/magit-blame.el"
                   "lisp/magit-ediff.el"
                   "lisp/magit-extras.el"
-                  "lisp/git-rebase.el"
                   "Documentation/magit.texi"
                   "Documentation/AUTHORS.md"
                   "COPYING"
@@ -1192,6 +1192,16 @@ let self = _self // overrides;
       description = "Emacs mode for editig Git commit messages";
     };
   };
+  git-rebase = melpaBuild rec {
+    pname = "git-rebase";
+    version = magit.version;
+    src = magit.src;
+    packageRequires = [ dash with-editor magit ];
+    fileSpecs = [ "lisp/git-rebase.el" ];
+    meta = magit.meta // {
+      description = "Emacs major-mode which makes editing rebase scripts more fun";
+    };
+  };
   magit-popup = melpaBuild rec {
     pname = "magit-popup";
     version = magit.version;