public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hindent: build Emacs package with latest Melpa recipe

Browse Source 
The hindent Emacs package is built with the latest Melpa recipe, but the same
source version as in haskellPackages.
This commit is contained in:
Thomas Tuegel
2018-07-26 15:34:39 -05:00
parent 62dca7c9ab
commit 4f5837668b
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@@ -94,6 +94,14 @@ self:
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
# Build same version as Haskell package
hindent = super.hindent.overrideAttrs (attrs: {
version = external.hindent.version;
src = external.hindent.src;
packageRequires = [ self.haskell-mode ];
propagatedUserEnvPkgs = [ external.hindent ];
});
# upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;

8
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View File

@@ -108,6 +108,14 @@ self:
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
# Build same version as Haskell package
hindent = super.hindent.overrideAttrs (attrs: {
version = external.hindent.version;
src = external.hindent.src;
packageRequires = [ self.haskell-mode ];
propagatedUserEnvPkgs = [ external.hindent ];
});
# upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;

17
pkgs/top-level/emacs-packages.nix
View File

@@ -298,23 +298,6 @@ let
helm-words = callPackage ../applications/editors/emacs-modes/helm-words { };
hindent = melpaBuild rec {
pname = "hindent";
version = external.hindent.version;
src = external.hindent.src;
packageRequires = [ haskell-mode ];
propagatedUserEnvPkgs = [ external.hindent ];
recipe = writeText "recipe" ''
(hindent
:repo "commercialhaskell/hindent" :fetcher github
:files ("elisp/*.el"))
'';
meta = {
description = "Indent haskell code using the \"hindent\" program";
license = bsd3;
};
};
icicles = callPackage ../applications/editors/emacs-modes/icicles { };
redshank = callPackage ../applications/editors/emacs-modes/redshank { };