From 70298659d7931562356063d50e8349f49748def3 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 11 Apr 2018 06:14:25 -0400
Subject: emacsPackagesNg: fix evaluation issues

There were some overrides relating to packages that were removed, as
well as some packages that still remained but depended on packages
that were removed.
---
 .../editors/emacs-modes/melpa-generated.nix        | 42 ----------------------
 .../editors/emacs-modes/melpa-packages.nix         |  6 ----
 .../editors/emacs-modes/melpa-stable-generated.nix | 21 -----------
 .../editors/emacs-modes/melpa-stable-packages.nix  |  3 --
 4 files changed, 72 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a1e079b57283..8fb655507d0a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -26791,27 +26791,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
-    melpaBuild {
-        pname = "fold-dwim-org";
-        version = "20131203.551";
-        src = fetchFromGitHub {
-          owner = "mattfidler";
-          repo = "fold-dwim-org";
-          rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
-          sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org";
-          sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
-          name = "fold-dwim-org";
-        };
-        packageRequires = [ fold-dwim ];
-        meta = {
-          homepage = "https://melpa.org/#/fold-dwim-org";
-          license = lib.licenses.free;
-        };
-      }) {};
     fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fold-this";
@@ -66326,27 +66305,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-marks = callPackage ({ fetchFromGitHub, fetchurl, fm, lib, melpaBuild }:
-    melpaBuild {
-        pname = "show-marks";
-        version = "20130805.749";
-        src = fetchFromGitHub {
-          owner = "vapniks";
-          repo = "show-marks";
-          rev = "97609566582e65eed0d0a854efa5c312f209115d";
-          sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f2007ab49d123e324c8d7c09bca9de33468d98ab/recipes/show-marks";
-          sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
-          name = "show-marks";
-        };
-        packageRequires = [ fm ];
-        meta = {
-          homepage = "https://melpa.org/#/show-marks";
-          license = lib.licenses.free;
-        };
-      }) {};
     showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "showtip";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index d23c735aba47..86c81cc9721e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -94,9 +94,6 @@ self:
       # Expects bash to be at /bin/bash
       flycheck-rtags = markBroken super.flycheck-rtags;
 
-      # upstream issue: missing file header
-      fold-dwim = markBroken super.fold-dwim;
-
       # build timeout
       graphene = markBroken super.graphene;
 
@@ -164,9 +161,6 @@ self:
       # upstream issue: missing file header
       qiita = markBroken super.qiita;
 
-      # upstream issue: missing package version
-      quack = markBroken super.quack;
-
       # upstream issue: missing file header
       railgun = markBroken super.railgun;
 
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 7302bc1d7550..791617c2122d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -14129,27 +14129,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
-    melpaBuild {
-        pname = "fold-dwim-org";
-        version = "0.6";
-        src = fetchFromGitHub {
-          owner = "mattfidler";
-          repo = "fold-dwim-org";
-          rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
-          sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/97d22d9feaf521ce576b80d2933ecbc166c1dbe7/recipes/fold-dwim-org";
-          sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
-          name = "fold-dwim-org";
-        };
-        packageRequires = [ fold-dwim ];
-        meta = {
-          homepage = "https://melpa.org/#/fold-dwim-org";
-          license = lib.licenses.free;
-        };
-      }) {};
     fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fold-this";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index be01b125cb71..7592fdbcae11 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -96,9 +96,6 @@ self:
       # Expects bash to be at /bin/bash
       flycheck-rtags = markBroken super.flycheck-rtags;
 
-      # upstream issue: missing file header
-      fold-dwim = markBroken super.fold-dwim;
-
       # build timeout
       graphene = markBroken super.graphene;
 
-- 
cgit 1.4.1