Remove obsolete magit (and associated packages) version
This commit is contained in:
Michael Alan Dorman
parent
a58e53c56e
commit
14ba2f4f24
@ -1,29 +0,0 @@
|
|||||||
{ stdenv, fetchFromGitHub, emacs }:
|
|
||||||
|
|
||||||
let
|
|
||||||
version = "1.2.0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "git-modes-${version}";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "magit";
|
|
||||||
repo = "git-modes";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ emacs ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/share/emacs/site-lisp
|
|
||||||
mv *.el *.elc $out/share/emacs/site-lisp/
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://github.com/magit/git-modes";
|
|
||||||
description = "Emacs modes for various Git-related files";
|
|
||||||
license = stdenv.lib.licenses.gpl3Plus;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ simons ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
|
|
||||||
|
|
||||||
let
|
|
||||||
version = "2.3.0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "magit-${version}";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "magit";
|
|
||||||
repo = "magit";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ emacs texinfo git ];
|
|
||||||
propagatedUserEnvPkgs = [ gitModes dash ];
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
makeFlagsArray=(
|
|
||||||
PREFIX="$out"
|
|
||||||
lispdir="$out/share/emacs/site-lisp"
|
|
||||||
DASH_DIR="${dash}/share/emacs/site-lisp"
|
|
||||||
VERSION="${version}"
|
|
||||||
)
|
|
||||||
make ''${makeFlagsArray[@]} -C lisp magit-version.el
|
|
||||||
cp lisp/magit-version.el Documentation/
|
|
||||||
cp lisp/magit-version.el .
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = false; # 2 out of 15 tests fails, not sure why
|
|
||||||
checkTarget = "test";
|
|
||||||
preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://github.com/magit/magit";
|
|
||||||
description = "Magit, an Emacs interface to Git";
|
|
||||||
license = stdenv.lib.licenses.gpl3Plus;
|
|
||||||
|
|
||||||
longDescription = ''
|
|
||||||
With Magit, you can inspect and modify your Git repositories with
|
|
||||||
Emacs. You can review and commit the changes you have made to the
|
|
||||||
tracked files, for example, and you can browse the history of past
|
|
||||||
changes. There is support for cherry picking, reverting, merging,
|
|
||||||
rebasing, and other common Git operations.
|
|
||||||
|
|
||||||
Magit is not a complete interface to Git; it just aims to make the
|
|
||||||
most common Git operations convenient. Thus, Magit will likely not
|
|
||||||
save you from learning Git itself.
|
|
||||||
'';
|
|
||||||
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ simons ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -12268,8 +12268,6 @@ in
|
|||||||
|
|
||||||
gist = callPackage ../applications/editors/emacs-modes/gist { };
|
gist = callPackage ../applications/editors/emacs-modes/gist { };
|
||||||
|
|
||||||
gitModes = callPackage ../applications/editors/emacs-modes/git-modes { };
|
|
||||||
|
|
||||||
haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
|
haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
|
||||||
|
|
||||||
hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
|
hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
|
||||||
@ -12298,8 +12296,6 @@ in
|
|||||||
|
|
||||||
loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
|
loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
|
||||||
|
|
||||||
magit = callPackage ../applications/editors/emacs-modes/magit { };
|
|
||||||
|
|
||||||
markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { };
|
markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { };
|
||||||
|
|
||||||
maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
|
maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
|
||||||
|
|||||||
@ -765,20 +765,6 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Deprecated in favor of git-commit
|
|
||||||
git-commit-mode = melpaBuild rec {
|
|
||||||
pname = "git-commit-mode";
|
|
||||||
version = "1.0.0";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "magit";
|
|
||||||
repo = "git-modes";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
|
|
||||||
};
|
|
||||||
files = [ "git-commit-mode.el" ];
|
|
||||||
meta = git-commit.meta;
|
|
||||||
};
|
|
||||||
|
|
||||||
git-gutter = melpaBuild rec {
|
git-gutter = melpaBuild rec {
|
||||||
pname = "git-gutter";
|
pname = "git-gutter";
|
||||||
version = "20150930";
|
version = "20150930";
|
||||||
@ -797,20 +783,6 @@ let
|
|||||||
|
|
||||||
#TODO git-gutter-fringe
|
#TODO git-gutter-fringe
|
||||||
|
|
||||||
# Deprecated in favor of git-rebase
|
|
||||||
git-rebase-mode = melpaBuild rec {
|
|
||||||
pname = "git-rebase-mode";
|
|
||||||
version = "1.0.0";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "magit";
|
|
||||||
repo = "git-modes";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
|
|
||||||
};
|
|
||||||
files = [ "git-rebase-mode.el" ];
|
|
||||||
meta = git-rebase.meta;
|
|
||||||
};
|
|
||||||
|
|
||||||
git-timemachine = melpaBuild rec {
|
git-timemachine = melpaBuild rec {
|
||||||
pname = "git-timemachine";
|
pname = "git-timemachine";
|
||||||
version = "2.3";
|
version = "2.3";
|
||||||
@ -1138,85 +1110,6 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
magit = melpaBuild rec {
|
|
||||||
pname = "magit";
|
|
||||||
version = "2.3.1";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = pname;
|
|
||||||
repo = pname;
|
|
||||||
rev = version;
|
|
||||||
sha256 = "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd";
|
|
||||||
};
|
|
||||||
packageRequires = [ dash git-commit magit-popup with-editor ];
|
|
||||||
fileSpecs = [ "lisp/magit-utils.el"
|
|
||||||
"lisp/magit-section.el"
|
|
||||||
"lisp/magit-git.el"
|
|
||||||
"lisp/magit-mode.el"
|
|
||||||
"lisp/magit-process.el"
|
|
||||||
"lisp/magit-core.el"
|
|
||||||
"lisp/magit-diff.el"
|
|
||||||
"lisp/magit-wip.el"
|
|
||||||
"lisp/magit-apply.el"
|
|
||||||
"lisp/magit-log.el"
|
|
||||||
"lisp/magit.el"
|
|
||||||
"lisp/magit-sequence.el"
|
|
||||||
"lisp/magit-commit.el"
|
|
||||||
"lisp/magit-remote.el"
|
|
||||||
"lisp/magit-bisect.el"
|
|
||||||
"lisp/magit-stash.el"
|
|
||||||
"lisp/magit-blame.el"
|
|
||||||
"lisp/magit-ediff.el"
|
|
||||||
"lisp/magit-extras.el"
|
|
||||||
"Documentation/magit.texi"
|
|
||||||
"Documentation/AUTHORS.md"
|
|
||||||
"COPYING"
|
|
||||||
];
|
|
||||||
meta = {
|
|
||||||
description = "Emacs interface for Git that aspires to be a complete Git porcelain";
|
|
||||||
license = gpl3Plus;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
git-commit = melpaBuild rec {
|
|
||||||
pname = "git-commit";
|
|
||||||
version = magit.version;
|
|
||||||
src = magit.src;
|
|
||||||
packageRequires = [ dash with-editor ];
|
|
||||||
fileSpecs = [ "lisp/git-commit.el" ];
|
|
||||||
meta = magit.meta // {
|
|
||||||
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;
|
|
||||||
src = magit.src;
|
|
||||||
packageRequires = [ dash with-editor ];
|
|
||||||
fileSpecs = [ "Documentation/magit-popup.texi" "lisp/magit-popup.el" ];
|
|
||||||
meta = magit.meta // {
|
|
||||||
description = "Infix arguments with feedback in a buffer library for Emacs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
with-editor = melpaBuild rec {
|
|
||||||
pname = "with-editor";
|
|
||||||
version = magit.version;
|
|
||||||
src = magit.src;
|
|
||||||
packageRequires = [ async dash ];
|
|
||||||
fileSpecs = [ "Documentation/with-editor.texi" "lisp/with-editor.el" ];
|
|
||||||
meta = magit.meta // {
|
|
||||||
description = "Use the Emacsclient as EDITOR of child processes library for Emacs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
markdown-toc = melpaBuild rec {
|
markdown-toc = melpaBuild rec {
|
||||||
pname = "markdown-toc";
|
pname = "markdown-toc";
|
||||||
version = "0.0.8";
|
version = "0.0.8";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user