diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:40:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:44:40 +0200 |
| commit | 0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch) | |
| tree | 146620da711f1221bbc226b5ffa36407b50a3fc3 /pkgs/applications/editors/emacs-modes | |
| parent | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff) | |
| parent | d567c486ca5ac5f0c83bb0264c325204a479a5bb (diff) | |
| download | nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.gz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.bz2 nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.lz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.xz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.zst nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.zip | |
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/offlineimap/default.nix | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 8f440819afed..a401bbc0be1b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -83,9 +83,6 @@ self: packageRequires = with self; [ evil highlight ]; }); - # missing OCaml - flycheck-ocaml = markBroken super.flycheck-ocaml; - # Expects bash to be at /bin/bash flycheck-rtags = markBroken super.flycheck-rtags; @@ -175,9 +172,6 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - # missing OCaml - merlin = markBroken super.merlin; - mhc = super.mhc.override { inherit (self.melpaPackages) calfw; }; diff --git a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix index f61eaa982663..e03b1a42ab1a 100644 --- a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix +++ b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "OfflineIMAP support for Emacs"; homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = [ ]; broken = true; }; } |