pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #44138 from ttuegel/emacs-packages/hindent

hindent: build Emacs package with latest Melpa recipe

authored by Thomas Tuegel and committed by GitHub c836833c 62dca7c9

+16 -17
unified split
+8
pkgs/applications/editors/emacs-modes/melpa-packages.nix
··· 94 # Expects bash to be at /bin/bash 95 helm-rtags = markBroken super.helm-rtags; 96 97 # upstream issue: missing file header 98 ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; 99
··· 94 # Expects bash to be at /bin/bash 95 helm-rtags = markBroken super.helm-rtags; 96 97 + # Build same version as Haskell package 98 + hindent = super.hindent.overrideAttrs (attrs: { 99 + version = external.hindent.version; 100 + src = external.hindent.src; 101 + packageRequires = [ self.haskell-mode ]; 102 + propagatedUserEnvPkgs = [ external.hindent ]; 103 + }); 104 + 105 # upstream issue: missing file header 106 ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; 107
+8
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
··· 108 # Expects bash to be at /bin/bash 109 helm-rtags = markBroken super.helm-rtags; 110 111 # upstream issue: missing file header 112 ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; 113
··· 108 # Expects bash to be at /bin/bash 109 helm-rtags = markBroken super.helm-rtags; 110 111 + # Build same version as Haskell package 112 + hindent = super.hindent.overrideAttrs (attrs: { 113 + version = external.hindent.version; 114 + src = external.hindent.src; 115 + packageRequires = [ self.haskell-mode ]; 116 + propagatedUserEnvPkgs = [ external.hindent ]; 117 + }); 118 + 119 # upstream issue: missing file header 120 ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; 121
-17
pkgs/top-level/emacs-packages.nix
··· 298 299 helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; 300 301 - hindent = melpaBuild rec { 302 - pname = "hindent"; 303 - version = external.hindent.version; 304 - src = external.hindent.src; 305 - packageRequires = [ haskell-mode ]; 306 - propagatedUserEnvPkgs = [ external.hindent ]; 307 - recipe = writeText "recipe" '' 308 - (hindent 309 - :repo "commercialhaskell/hindent" :fetcher github 310 - :files ("elisp/*.el")) 311 - ''; 312 - meta = { 313 - description = "Indent haskell code using the \"hindent\" program"; 314 - license = bsd3; 315 - }; 316 - }; 317 - 318 icicles = callPackage ../applications/editors/emacs-modes/icicles { }; 319 320 redshank = callPackage ../applications/editors/emacs-modes/redshank { };
··· 298 299 helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; 300 301 icicles = callPackage ../applications/editors/emacs-modes/icicles { }; 302 303 redshank = callPackage ../applications/editors/emacs-modes/redshank { };