diff --git a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix index d57c591ec1e8..e0057fd30cea 100644 --- a/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/nyan-mode/default.nix @@ -1,4 +1,4 @@ -{trivialBuild, lib, fetchFromGitHub}: +{lib, trivialBuild, fetchFromGitHub}: trivialBuild rec { pname = "nyan-mode"; @@ -23,9 +23,8 @@ trivialBuild rec { cp -r mus $out ''; - meta = with lib; { + meta = { description = "An analog indicator of the position in the buffer"; - homepage = https://github.com/TeMPOraL/nyan-mode/; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index be81e93e32ae..6fd630b13f4a 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -16,10 +16,14 @@ with lib; }@args: let + defaultMeta = { broken = false; platforms = emacs.meta.platforms; + } // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; }; + in stdenv.mkDerivation ({ diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 607a1b4a5ef6..5eaa995b4126 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -31,7 +31,7 @@ let targets = concatStringsSep " " (if files == null then fileSpecs else files); defaultMeta = { - homepage = "http://melpa.org/#/${pname}"; + homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}"; }; in diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5982a9f5ce71..a8cce92c1bc0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -127,7 +127,6 @@ let self = _self // overrides; mode which displays current match and total matches information in the mode-line in various search mode. ''; - homepage = https://github.com/syohex/emacs-anzu/; license = gpl3Plus; }; }; @@ -194,7 +193,6 @@ let self = _self // overrides; description = "Auto-complete extension for Emacs"; homepage = http://cx4a.org/software/auto-complete/; license = gpl3Plus; - platforms = lib.platforms.all; }; }; @@ -235,7 +233,6 @@ let self = _self // overrides; }; meta = { description = "Interactively insert items from Emacs kill-ring"; - homepage = https://github.com/browse-kill-ring/browse-kill-ring/; license = gpl2Plus; }; }; @@ -251,7 +248,6 @@ let self = _self // overrides; }; meta = { description = "Mouseable text in Emacs"; - homepage = "https://github.com/rolandwalker/button-lock"; license = bsd2; }; }; @@ -355,7 +351,6 @@ let self = _self // overrides; The API and implementations were translated from JSDeferred (by cho45) and Mochikit.Async (by Bob Ippolito) in JavaScript. ''; - homepage = https://github.com/kiwanami/emacs-deferred; license = gpl3Plus; }; }; @@ -770,7 +765,6 @@ let self = _self // overrides; }; meta = { description = "Does what you expected ido-everywhere to do in Emacs"; - homepage = https://github.com/DarwinAwardWinner/ido-ubiquitous/; license = gpl3Plus; }; }; @@ -949,7 +943,9 @@ let self = _self // overrides; }; }; - nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {}; + nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode { + inherit lib; + }; org-plus-contrib = melpaBuild rec { pname = "org-plus-contrib"; @@ -1211,7 +1207,6 @@ let self = _self // overrides; }; meta = { description = "M-x enhancement for Emacs build on top of Ido"; - homepage = https://github.com/nonsequitur/smex/; license = emacs.meta.license; # should be "same as Emacs" }; }; @@ -1224,7 +1219,6 @@ let self = _self // overrides; fileSpecs = [ "elisp/*.el" ]; meta = { - homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; license = bsd3; platforms = external.structured-haskell-mode.meta.platforms;