emacs-packages: Drop irony package

Use auto-generated melpa package

2 files changed, 28 insertions, 39 deletions

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 47cc7ce1c64f4..920572198d0fb 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -105,6 +105,27 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
+        irony = super.irony.overrideAttrs(old: {
+          preConfigure = ''
+            cd server
+          '';
+          preBuild = ''
+            make
+          '';
+          postInstall = ''
+            mkdir -p $out
+            mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
+            rm -rf $out/share/emacs/site-lisp/elpa/*/server
+          '';
+          preCheck = ''
+            cd source/server
+          '';
+          dontUseCmakeBuildDir = true;
+          doCheck = true;
+          packageRequires = [ self.emacs ];
+          nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
+        });
+
         # tries to write a log file to $HOME
         insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
           HOME = "/tmp";
@@ -356,6 +377,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # Expects bash to be at /bin/bash
         helm-rtags = markBroken super.helm-rtags;
 
+        # Fails with "package does not untar cleanly into ..."
+        irony = shared.irony.overrideAttrs(old: {
+          meta = old.meta // {
+            broken = true;
+          };
+        });
+
         magit-annex = super.magit-annex.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 95a3a7d34f4a6..2b9e21ac13b2f 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -181,45 +181,6 @@ let
 
     icicles = callPackage ../applications/editors/emacs-modes/icicles { };
 
-    irony = melpaBuild rec {
-      pname = "irony";
-      ename = "irony";
-      version = "20190516";
-      src = fetchFromGitHub {
-        owner = "Sarcasm";
-        repo = "irony-mode";
-        rev = "c3ae899b61124a747ebafc705086345e460ac08e";
-        sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
-      };
-      recipe = fetchurl {
-        url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony";
-        sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
-        name = "recipe";
-      };
-      preConfigure = ''
-        cd server
-      '';
-      preBuild = ''
-        make
-      '';
-      postInstall = ''
-        mkdir -p $out
-        mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
-        rm -rf $out/share/emacs/site-lisp/elpa/*/server
-      '';
-      preCheck = ''
-        cd source/server
-      '';
-      dontUseCmakeBuildDir = true;
-      doCheck = true;
-      packageRequires = [ emacs ];
-      nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
-      meta = {
-        homepage = "https://melpa.org/#/irony";
-        license = lib.licenses.gpl3;
-      };
-    };
-
     rtags = melpaBuild rec {
       pname = "rtags";
       version = "2.12";