diff options
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
20 files changed, 31 insertions, 22 deletions
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 34120db6aa70..8c9b7771b0f7 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.8.4"; - name = "cask-${version}"; + pname = "cask"; src = fetchFromGitHub { owner = "cask"; diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix index 2d1cbb75981e..ce9f57ef40b6 100644 --- a/pkgs/applications/editors/emacs-modes/cedille/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix @@ -1,7 +1,7 @@ { stdenv, cedille, emacs }: stdenv.mkDerivation rec { - name = "cedille-mode-${version}"; + pname = "cedille-mode"; version = cedille.version; src = cedille.src; diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix index 5b408ad7999d..108d23ce2339 100644 --- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix +++ b/pkgs/applications/editors/emacs-modes/cryptol/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "cryptol-mode-${version}"; + pname = "cryptol-mode"; version = "0.1.0"; src = fetchurl { diff --git a/pkgs/applications/editors/emacs-modes/d/default.nix b/pkgs/applications/editors/emacs-modes/d/default.nix index 28736acded2f..779ba992686a 100644 --- a/pkgs/applications/editors/emacs-modes/d/default.nix +++ b/pkgs/applications/editors/emacs-modes/d/default.nix @@ -4,7 +4,8 @@ let version = "20150111"; in stdenv.mkDerivation { - name = "emacs-d-${version}"; + pname = "emacs-d"; + inherit version; src = fetchurl { url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 6b10766bedb7..b55cf9989914 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -6,7 +6,8 @@ let version = "13.14-169-g0d3569d"; # git describe --tags in stdenv.mkDerivation { - name = "haskell-mode-${version}"; + pname = "haskell-mode"; + inherit version; src = fetchFromGitHub { owner = "haskell"; diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index c32669239f88..ce13c3042b9f 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn }: stdenv.mkDerivation rec { - name = "hol_light-mode-${version}"; + pname = "hol_light-mode"; version = "73"; src = fetchsvn { diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 199a5886e1df..75b72516a3cd 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -6,7 +6,8 @@ let version = "0.15"; in stdenv.mkDerivation { - name = "hsc3-mode-${version}"; + pname = "hsc3-mode"; + inherit version; src = fetchurl { url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 17cf213a799d..27dcd1063bf2 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -21,7 +21,7 @@ let in stdenv.mkDerivation rec { version = "2019-02-22"; - name = "icicles-${version}"; + pname = "icicles"; srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/"; + installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; meta = { homepage = https://www.emacswiki.org/emacs/Icicles; diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix index 3cc8156337e0..eaa0f2c2a5b1 100644 --- a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix +++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix @@ -4,7 +4,8 @@ let version = "3.6-4-gb659bf8"; in stdenv.mkDerivation { - name = "ido-ubiquitous-${version}"; + pname = "ido-ubiquitous"; + inherit version; src = fetchFromGitHub { owner = "DarwinAwardWinner"; diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 2e168b3abf7f..18e2e8ec1685 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "idris-mode"; version = "0.9.18"; diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix index c0ddbc88cf27..c8b64130872a 100644 --- a/pkgs/applications/editors/emacs-modes/jabber/default.nix +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -2,9 +2,8 @@ stdenv.mkDerivation rec { pname = "emacs-jabber"; version = "0.8.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix index 7176b289b8b5..4e79e9edda7b 100644 --- a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix @@ -4,7 +4,8 @@ let version = "2.0-82-gfe30ef7"; in stdenv.mkDerivation { - name = "markdown-mode-${version}"; + pname = "markdown-mode"; + inherit version; src = fetchFromGitHub { owner = "defunkt"; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index 9f8d408dd5a2..becc2dc5dc9b 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -5,7 +5,8 @@ let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; in stdenv.mkDerivation { - name = "ocaml-mode-${version}"; + pname = "ocaml-mode"; + inherit version; inherit (ocaml) prefixKey src; # a quick configure to get the Makefile generated. Since diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix index 0f7ac1d1dc80..1f59a355da39 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }: stdenv.mkDerivation rec { - name = "ProofGeneral-${version}"; + pname = "ProofGeneral"; version = "4.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index de72b24f87ac..99d7f641eac5 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: stdenv.mkDerivation (rec { - name = "ProofGeneral-unstable-${version}"; + pname = "ProofGeneral-unstable"; version = "2018-01-30"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 2b4223cdc1fd..9dfe089fe290 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -3,7 +3,8 @@ let version = "1.3.13"; in stdenv.mkDerivation { - name = "emacs-rainbow-delimiters-${version}"; + pname = "emacs-rainbow-delimiters"; + inherit version; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix index 0031ffee4d4d..8b9e08a53783 100644 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation { - name = "rudel-${version}"; + pname = "rudel"; + inherit version; src = fetchurl { url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/s/default.nix b/pkgs/applications/editors/emacs-modes/s/default.nix index b818348939e8..fc79ec46761e 100644 --- a/pkgs/applications/editors/emacs-modes/s/default.nix +++ b/pkgs/applications/editors/emacs-modes/s/default.nix @@ -3,7 +3,8 @@ let version = "1.9.0"; in stdenv.mkDerivation { - name = "emacs-s-${version}"; + pname = "emacs-s"; + inherit version; src = fetchurl { url = "https://github.com/magnars/s.el/archive/${version}.tar.gz"; diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index be03938f8a53..556b27e4cbfd 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -6,7 +6,8 @@ let version = "2.0.9"; in stdenv.mkDerivation { - name = "tuareg-mode-${version}"; + pname = "tuareg-mode"; + inherit version; src = fetchzip { url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; diff --git a/pkgs/applications/editors/emacs-modes/writegood/default.nix b/pkgs/applications/editors/emacs-modes/writegood/default.nix index 6d0631a4cb83..5f3041d22d42 100644 --- a/pkgs/applications/editors/emacs-modes/writegood/default.nix +++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix @@ -3,7 +3,8 @@ let version = "2.0.2"; in stdenv.mkDerivation { - name = "writegood-mode-${version}"; + pname = "writegood-mode"; + inherit version; src = fetchurl { url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz"; sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k"; |