Merge pull request #44007 from ttuegel/emacs-packages-2018-07-22

Emacs package updates

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -75,28 +75,16 @@ self:
       # upstream issue: missing file header
       elmine = markBroken super.elmine;
 
-      # upstream issue: missing dependency redshank
-      emr = markBroken super.emr;
-
       ess-R-data-view = super.ess-R-data-view.override {
         inherit (self.melpaPackages) ess ctable popup;
       };
 
-      # upstream issue: missing dependency highlight
-      evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
-
-      # upstream issue: missing dependency highlight
-      floobits  = markBroken super.floobits;
-
       # missing OCaml
       flycheck-ocaml = markBroken super.flycheck-ocaml;
 
       # Expects bash to be at /bin/bash
       flycheck-rtags = markBroken super.flycheck-rtags;
 
-      # upstream issue: missing dependency
-      fold-dwim-org = markBroken super.fold-dwim-org;
-
       # build timeout
       graphene = markBroken super.graphene;
 
@@ -158,9 +146,6 @@ self:
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
          }));
 
-      # upstream issue: missing dependency
-      org-readme = markBroken super.org-readme;
-
       # upstream issue: truncated file
       powershell = markBroken super.powershell;
 
@@ -173,9 +158,6 @@ self:
       # upstream issue: missing file footer
       seoul256-theme = markBroken super.seoul256-theme;
 
-      # upstream issue: missing dependency highlight
-      sonic-pi  = markBroken super.sonic-pi;
-
       spaceline = super.spaceline.override {
         inherit (self.melpaPackages) powerline;
       };
@@ -198,9 +180,6 @@ self:
       # upstream issue: missing file header
       voca-builder = markBroken super.voca-builder;
 
-      # upstream issue: missing dependency
-      weechat-alert = markBroken super.weechat-alert;
-
       # upstream issue: missing file header
       window-numbering = markBroken super.window-numbering;
 
@@ -216,6 +195,10 @@ self:
       });
     };
 
-    melpaPackages = super // overrides;
+    melpaPackages =
+      removeAttrs (super // overrides)
+      [
+        "show-marks"  # missing dependency: fm
+      ];
   in
     melpaPackages // { inherit melpaPackages; }

pkgs/applications/editors/emacs-modes/org-generated.nix

@@ -3,10 +3,11 @@
     org = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "org";
-        version = "20180716";
+        ename = "org";
+        version = "20180723";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20180716.tar";
+          url = "http://orgmode.org/elpa/org-20180723.tar";
-          sha256 = "0gr57nfdncnxrxxzw87ni5i6zjh1mdxl9h8pw96msh1c47xhpk2d";
+          sha256 = "1mcgnba16lpyh55zjx4rcbmpygcmdnjjzvgv1rx0c3kz1h5fgzf8";
         };
         packageRequires = [];
         meta = {
@@ -17,10 +18,11 @@
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "org-plus-contrib";
-        version = "20180716";
+        ename = "org-plus-contrib";
+        version = "20180723";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20180716.tar";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20180723.tar";
-          sha256 = "0j4r3bcy96kcaab7cv2a5qd0mv8ddkr1qlihijk79l9nhsh2y4hm";
+          sha256 = "1l34bagkm8mcyv5diprpbd4yjijkdvx1l54qpvi8bmvxjnzsm7mk";
         };
         packageRequires = [];
         meta = {

pkgs/build-support/emacs/melpa.nix

@@ -5,7 +5,15 @@
 
 with lib;
 
-{ pname
+{ /*
+    pname: Nix package name without special symbols and without version or
+    "emacs-" prefix.
+  */
+  pname
+  /*
+    ename: Original Emacs package name, possibly containing special symbols.
+  */
+, ename ? pname
 , version
 , recipe
 , meta ? {}
@@ -35,7 +43,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   preUnpack = ''
     mkdir -p "$NIX_BUILD_TOP/recipes"
     if [ -n "$recipe" ]; then
-      cp "$recipe" "$NIX_BUILD_TOP/recipes/$pname"
+      cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename"
     fi
 
     ln -s "$melpa/package-build" "$NIX_BUILD_TOP/package-build"
@@ -45,7 +53,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
 
   postUnpack = ''
     mkdir -p "$NIX_BUILD_TOP/working"
-    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$pname"
+    ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
   '';
 
   buildPhase =
@@ -58,7 +66,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
           -L "$melpa/package-build" \
           -l "$melpa2nix" \
           -f melpa2nix-build-package \
-          $pname $version
+          $ename $version
 
       runHook postBuild
     '';
@@ -66,9 +74,9 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   installPhase = ''
     runHook preInstall
 
-    archive="$NIX_BUILD_TOP/packages/$pname-$version.el"
+    archive="$NIX_BUILD_TOP/packages/$ename-$version.el"
     if [ ! -f "$archive" ]; then
-        archive="$NIX_BUILD_TOP/packages/$pname-$version.tar"
+        archive="$NIX_BUILD_TOP/packages/$ename-$version.tar"
     fi
 
     emacs --batch -Q \