From d172d404e95d6f5e3baa5de04b9ffb5cca9cf9c1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:45:45 +0800 Subject: [PATCH 01/11] emacs-cmake: upstream is OK again --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 56b17a865df..b4ae8594391 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -52,10 +52,6 @@ self: # part of a larger package caml = dontConfigure super.caml; - # part of a larger package - # upstream issue: missing package version - cmake-mode = markBroken (dontConfigure super.cmake-mode); - # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; From 66d16a540936c117922c96fb19ad52b803bdafc4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:46:07 +0800 Subject: [PATCH 02/11] emacs-evil-magit: needs git --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index b4ae8594391..7520db00851 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -75,6 +75,12 @@ self: inherit (self.melpaPackages) ess ctable popup; }; + evil-magit = super.evil-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; From 64c0d50fc33b2e00e1d6ee8f698bfdccf1801a51 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:46:21 +0800 Subject: [PATCH 03/11] emacs-evil-search-highlight-persist: add dependencies --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 7520db00851..d91e985da2b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -81,6 +81,11 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + # missing dependencies + evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { + packageRequires = with self; [ evil highlight ]; + }); + # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; From fe6313da305b47a8984336c3d7faa16b3d097589 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:46:43 +0800 Subject: [PATCH 04/11] emacs-insert-shebang: fix compilation --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index d91e985da2b..0800bff12c5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -115,6 +115,11 @@ self: # upstream issue: missing file header initsplit = super.initsplit; + # tries to write a log file to $HOME + insert-shebang = super.insert-shebang.overrideAttrs (attrs: { + HOME = "/tmp"; + }); + # Expects bash to be at /bin/bash ivy-rtags = markBroken super.ivy-rtags; From 667938468ba3060be6afbcc6e946c9cc89c6522e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:47:12 +0800 Subject: [PATCH 05/11] emacs-magit-gitflow: git was missing --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 0800bff12c5..409b52fa062 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -143,6 +143,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; From b1914088e1607f58a6f4983f1b1e3573c2f4a102 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:47:33 +0800 Subject: [PATCH 06/11] emacs-powershell: upstream is OK again --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 409b52fa062..1fbff18901f 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -172,9 +172,6 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; })); - # upstream issue: truncated file - powershell = markBroken super.powershell; - # upstream issue: mismatched filename processing-snippets = markBroken super.processing-snippets; From bcbfed377edb82ddc2321d70110e7499dbda1ed3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:48:24 +0800 Subject: [PATCH 07/11] emacs-link: upstream is OK again --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 1fbff18901f..023e99dacd3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -126,9 +126,6 @@ self: # upstream issue: missing file header jsfmt = markBroken super.jsfmt; - # upstream issue: missing file header - link = markBroken super.link; - # upstream issue: missing file header maxframe = markBroken super.maxframe; From 0de9d840abfcfb114feee3a8c071f02b5a594ca8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:48:37 +0800 Subject: [PATCH 08/11] emacs-dictionary: upstream is OK again --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 023e99dacd3..c6650478fa2 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -58,9 +58,6 @@ self: # upstream issue: missing file header connection = markBroken super.connection; - # upstream issue: missing file header - dictionary = markBroken super.dictionary; - easy-kill-extras = super.easy-kill-extras.override { inherit (self.melpaPackages) easy-kill; }; From 5867097d1f7ffd24102e790d537c0e489ec3a49b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 13:48:51 +0800 Subject: [PATCH 09/11] emacs-connection: upstream is OK again --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index c6650478fa2..96920e3baca 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -55,9 +55,6 @@ self: # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; - # upstream issue: missing file header - connection = markBroken super.connection; - easy-kill-extras = super.easy-kill-extras.override { inherit (self.melpaPackages) easy-kill; }; From 9ddd60138cbc8dce2aaeffdf37f0d0bf52bc22b3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Aug 2018 16:04:57 +0800 Subject: [PATCH 10/11] emacs-php-auto-yasnippets: fix HOME --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 96920e3baca..f9022767ccd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -163,6 +163,11 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; })); + # tries to write to $HOME + php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { + HOME = "/tmp"; + }); + # upstream issue: mismatched filename processing-snippets = markBroken super.processing-snippets; From 9823e4caa7a4f40d2dd00351e815fffda9ffcccc Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 6 Aug 2018 17:09:26 +0800 Subject: [PATCH 11/11] emacs-magit-annex: git was missing --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f9022767ccd..a420c542556 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -134,6 +134,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs =