diff options
| author | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2018-07-26 15:34:39 -0500 |
|---|---|---|
| committer | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2018-07-26 15:36:43 -0500 |
| commit | 4f5837668bd02ff2df7865b50c1f679a25d51a53 (patch) | |
| tree | 78ab17c8fcca5e291d0bdbcc42516e364835ff1d | |
| parent | 62dca7c9ab08ee5cc2043d6d374013b8041a3f21 (diff) | |
| download | nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.tar nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.tar.gz nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.tar.bz2 nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.tar.lz nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.tar.xz nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.tar.zst nixpkgs-4f5837668bd02ff2df7865b50c1f679a25d51a53.zip | |
hindent: build Emacs package with latest Melpa recipe
The hindent Emacs package is built with the latest Melpa recipe, but the same source version as in haskellPackages.
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 17 |
3 files changed, 16 insertions, 17 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 2e474ed3410..56b17a865df 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -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; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index c0febd803cc..f3b77c708a7 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -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; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5d042c3385e..ba82bd217fd 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -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 { }; |