nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

emacs: keep elpa/nongnu/melpa package overrides sorted

The first half of melpa-packages.nix is not kept sorted in this PR
because it is a bit tricky. We will deal with it in the future.

Lin Jian 9f2faf68 50268f8a

+72 -51
+13 -7
pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
··· 14 14 ; 15 15 in 16 16 { 17 - cl-lib = null; # builtin 18 - cl-print = null; # builtin 19 - tle = null; # builtin 20 - advice = null; # builtin 21 - 17 + # keep-sorted start block=yes newline_separated=yes 22 18 # Compilation instructions for the Ada executables: 23 19 # https://www.nongnu.org/ada-mode/ 24 20 ada-mode = super.ada-mode.overrideAttrs ( ··· 61 65 # native-compiler-error-empty-byte in old versions 62 66 ada-ref-man = ignoreCompilationErrorIfOlder super.ada-ref-man "2020.1.0.20201129.190419"; 63 67 68 + advice = null; # builtin 69 + 64 70 # elisp error in old versions 65 71 ampc = ignoreCompilationErrorIfOlder super.ampc "0.2.0.20240220.181558"; 66 72 ··· 71 73 auctex-cont-latexmk = mkHome super.auctex-cont-latexmk; 72 74 73 75 auctex-label-numbers = mkHome super.auctex-label-numbers; 76 + 77 + cl-lib = null; # builtin 78 + 79 + cl-print = null; # builtin 74 80 75 81 # missing optional dependencies https://codeberg.org/rahguzar/consult-hoogle/issues/4 76 82 consult-hoogle = addPackageRequiresIfOlder super.consult-hoogle [ self.consult ] "0.2.2"; ··· 236 234 # native-ice https://github.com/mattiase/relint/issues/15 237 235 relint = ignoreCompilationError super.relint; 238 236 239 - shen-mode = ignoreCompilationErrorIfOlder super.shen-mode "0.1.0.20221221.82050"; # elisp error 240 - 241 237 # native compilation for tests/seq-tests.el never ends 242 238 # delete tests/seq-tests.el to workaround this 243 239 seq = super.seq.overrideAttrs (old: { ··· 250 250 tar --create --verbose --file=$src $content_directory 251 251 ''; 252 252 }); 253 + 254 + shen-mode = ignoreCompilationErrorIfOlder super.shen-mode "0.1.0.20221221.82050"; # elisp error 253 255 254 256 # https://github.com/alphapapa/taxy.el/issues/3 255 257 taxy = super.taxy.overrideAttrs (old: { ··· 270 268 tex-parens = mkHomeIfOlder super.tex-parens "0.4.0.20240630.70456"; 271 269 272 270 timerfunctions = ignoreCompilationErrorIfOlder super.timerfunctions "1.4.2.0.20201129.225252"; 271 + 272 + tle = null; # builtin 273 273 274 274 # kv is required in triples-test.el 275 275 # Alternatively, we can delete that file. But adding a dependency is easier. ··· 299 295 300 296 # native-ice https://github.com/mattiase/xr/issues/9 301 297 xr = ignoreCompilationError super.xr; 298 + 299 + # keep-sorted end 302 300 }
+2
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
··· 58 58 commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages; 59 59 60 60 overrides = self: super: { 61 + # keep-sorted start block=yes newline_separated=yes 62 + # keep-sorted end 61 63 }; 62 64 63 65 elpaDevelPackages =
+3 -1
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
··· 58 58 commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages; 59 59 60 60 overrides = self: super: { 61 + # keep-sorted start block=yes newline_separated=yes 61 62 # upstream issue: Wrong type argument: arrayp, nil 62 63 org-transclusion = 63 64 if super.org-transclusion.version == "1.2.0" then 64 65 markBroken super.org-transclusion 65 66 else 66 67 super.org-transclusion; 67 - rcirc-menu = markBroken super.rcirc-menu; # Missing file header 68 68 69 + rcirc-menu = markBroken super.rcirc-menu; # Missing file header 70 + # keep-sorted end 69 71 }; 70 72 71 73 elpaPackages =
+46 -42
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
··· 828 828 else 829 829 super.osx-dictionary; 830 830 831 + # keep-sorted start block=yes newline_separated=yes 831 832 # https://github.com/skeeto/at-el/issues/9 832 833 "@" = ignoreCompilationErrorIfOlder super."@" "20240923.1318"; 834 + 835 + "git-gutter-fringe+" = ignoreCompilationError super."git-gutter-fringe+"; # elisp error 833 836 834 837 abgaben = addPackageRequires (mkHome super.abgaben) [ self.mu4e ]; 835 838 ··· 885 882 886 883 auctex-latexmk = mkHome super.auctex-latexmk; 887 884 888 - auto-indent-mode = ignoreCompilationError super.auto-indent-mode; # elisp error 889 - 890 885 # missing optional dependencies 891 886 auto-complete-auctex = addPackageRequires (mkHome super.auto-complete-auctex) [ self.auctex ]; 892 887 893 888 # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 894 889 auto-complete-distel = ignoreCompilationError super.auto-complete-distel; 890 + 891 + auto-indent-mode = ignoreCompilationError super.auto-indent-mode; # elisp error 895 892 896 893 auto-virtualenv = super.auto-virtualenv.overrideAttrs ( 897 894 finalAttrs: previousAttrs: { ··· 1150 1147 # missing optional dependencies 1151 1148 ekg = addPackageRequires super.ekg [ self.denote ]; 1152 1149 1150 + el-secretario-mu4e = addPackageRequires super.el-secretario-mu4e [ self.mu4e ]; 1151 + 1153 1152 elfeed = super.elfeed.overrideAttrs (attrs: { 1154 1153 postPatch = 1155 1154 attrs.postPatch or "" ··· 1175 1170 ]; 1176 1171 }); 1177 1172 1178 - el-secretario-mu4e = addPackageRequires super.el-secretario-mu4e [ self.mu4e ]; 1179 - 1180 1173 embark-vc = buildWithGit super.embark-vc; 1181 1174 1182 1175 # https://github.com/nubank/emidje/issues/23 1183 1176 emidje = addPackageRequires super.emidje [ self.pkg-info ]; 1184 1177 1178 + emms-player-mpv-jp-radios = ignoreCompilationError super.emms-player-mpv-jp-radios; 1179 + 1185 1180 # depends on later-do which is not on any ELPA 1186 1181 emms-player-simple-mpv = ignoreCompilationError super.emms-player-simple-mpv; 1187 - emms-player-mpv-jp-radios = ignoreCompilationError super.emms-player-mpv-jp-radios; 1188 1182 1189 1183 # missing optional dependencies 1190 1184 # https://github.com/isamert/empv.el/pull/96 ··· 1277 1273 1278 1274 gh-notify = buildWithGit super.gh-notify; 1279 1275 1280 - "git-gutter-fringe+" = ignoreCompilationError super."git-gutter-fringe+"; # elisp error 1281 - 1282 1276 # https://github.com/nlamirault/emacs-gitlab/issues/68 1283 1277 gitlab = addPackageRequires super.gitlab [ self.f ]; 1284 1278 ··· 1312 1310 1313 1311 helm-ext = ignoreCompilationError super.helm-ext; # elisp error 1314 1312 1313 + # TODO report to upstream 1314 + helm-flycheck = fixRequireHelmCore super.helm-flycheck; 1315 + 1315 1316 # https://github.com/iory/emacs-helm-ghs/issues/1 1316 1317 helm-ghs = addPackageRequires super.helm-ghs [ self.helm-ghq ]; 1317 1318 ··· 1323 1318 self.helm 1324 1319 self.magit 1325 1320 ]; 1326 - 1327 - # TODO report to upstream 1328 - helm-flycheck = fixRequireHelmCore super.helm-flycheck; 1329 1321 1330 1322 # https://github.com/yasuyk/helm-git-grep/issues/54 1331 1323 helm-git-grep = addPackageRequires super.helm-git-grep [ self.helm ]; ··· 1549 1547 1550 1548 org-gtd = ignoreCompilationError super.org-gtd; # elisp error 1551 1549 1550 + # TODO report to upstream 1551 + org-kindle = addPackageRequires super.org-kindle [ self.dash ]; 1552 + 1552 1553 # needs newer org than the Emacs 29.4 builtin one 1553 1554 org-link-beautify = addPackageRequires super.org-link-beautify [ 1554 1555 self.org 1555 1556 self.qrencode 1556 1557 ]; 1557 - 1558 - # TODO report to upstream 1559 - org-kindle = addPackageRequires super.org-kindle [ self.dash ]; 1560 - 1561 - org-special-block-extras = ignoreCompilationError super.org-special-block-extras; # elisp error 1562 - 1563 - # https://github.com/ichernyshovvv/org-timeblock/issues/65 1564 - org-timeblock = markBroken super.org-timeblock; 1565 - 1566 - org-trello = ignoreCompilationError super.org-trello; # elisp error 1567 - 1568 - # Requires xwidgets compiled into emacs, so mark this package 1569 - # as broken if emacs hasn't been compiled with the flag. 1570 - org-xlatex = if self.emacs.withXwidgets then super.org-xlatex else markBroken super.org-xlatex; 1571 - 1572 - # Optimizer error: too much on the stack 1573 - orgnav = ignoreCompilationError super.orgnav; 1574 1558 1575 1559 org-noter = super.org-noter.overrideAttrs ( 1576 1560 finalAttrs: previousAttrs: { ··· 1577 1589 1578 1590 org-noter-pdftools = mkHome super.org-noter-pdftools; 1579 1591 1580 - # elisp error and missing optional dependencies 1581 - org-ref = ignoreCompilationError super.org-ref; 1582 - 1583 - # missing optional dependencies 1584 - org-roam-bibtex = addPackageRequires super.org-roam-bibtex [ 1585 - self.helm-bibtex 1586 - self.ivy-bibtex 1587 - ]; 1588 - 1589 1592 org-pdftools = mkHome super.org-pdftools; 1590 1593 1591 1594 org-projectile = super.org-projectile.overrideAttrs ( ··· 1595 1616 1596 1617 # https://github.com/colonelpanic8/org-project-capture/issues/66 1597 1618 org-projectile-helm = addPackageRequires super.org-projectile-helm [ self.helm-org ]; 1619 + 1620 + # elisp error and missing optional dependencies 1621 + org-ref = ignoreCompilationError super.org-ref; 1622 + 1623 + # missing optional dependencies 1624 + org-roam-bibtex = addPackageRequires super.org-roam-bibtex [ 1625 + self.helm-bibtex 1626 + self.ivy-bibtex 1627 + ]; 1628 + 1629 + org-special-block-extras = ignoreCompilationError super.org-special-block-extras; # elisp error 1630 + 1631 + # https://github.com/ichernyshovvv/org-timeblock/issues/65 1632 + org-timeblock = markBroken super.org-timeblock; 1633 + 1634 + org-trello = ignoreCompilationError super.org-trello; # elisp error 1635 + 1636 + # Requires xwidgets compiled into emacs, so mark this package 1637 + # as broken if emacs hasn't been compiled with the flag. 1638 + org-xlatex = if self.emacs.withXwidgets then super.org-xlatex else markBroken super.org-xlatex; 1639 + 1640 + # Optimizer error: too much on the stack 1641 + orgnav = ignoreCompilationError super.orgnav; 1598 1642 1599 1643 origami-predef = ignoreCompilationError super.origami-predef; # elisp error 1600 1644 ··· 1779 1777 # optional dependency spamfilter is not on any ELPA 1780 1778 wanderlust = ignoreCompilationError (addPackageRequires super.wanderlust [ self.shimbun ]); 1781 1779 1782 - # https://github.com/nicklanasa/xcode-mode/issues/28 1783 - xcode-mode = addPackageRequires super.xcode-mode [ self.hydra ]; 1784 - 1785 1780 weechat = ignoreCompilationError super.weechat; # elisp error 1786 1781 1787 1782 weechat-alert = ignoreCompilationError super.weechat-alert; # elisp error ··· 1787 1788 1788 1789 workgroups2 = ignoreCompilationError super.workgroups2; # elisp error 1789 1790 1791 + # https://github.com/nicklanasa/xcode-mode/issues/28 1792 + xcode-mode = addPackageRequires super.xcode-mode [ self.hydra ]; 1793 + 1790 1794 xenops = mkHome super.xenops; 1791 1795 1792 1796 # missing optional dependencies 1793 1797 xmlunicode = addPackageRequires super.xmlunicode [ self.helm ]; 1794 1798 1795 - # https://github.com/canatella/xwwp/issues/18 1796 - xwwp-follow-link-ivy = addPackageRequires super.xwwp-follow-link-ivy [ self.ivy ]; 1797 - 1798 1799 # https://github.com/canatella/xwwp/issues/19 1799 1800 xwwp-follow-link-helm = addPackageRequires super.xwwp-follow-link-helm [ self.helm ]; 1801 + 1802 + # https://github.com/canatella/xwwp/issues/18 1803 + xwwp-follow-link-ivy = addPackageRequires super.xwwp-follow-link-ivy [ self.ivy ]; 1800 1804 1801 1805 yara-mode = ignoreCompilationError super.yara-mode; # elisp error 1802 1806 ··· 1820 1818 1821 1819 # missing optional dependencies 1822 1820 zotxt = addPackageRequires super.zotxt [ self.org-noter ]; 1821 + 1822 + # keep-sorted end 1823 1823 }; 1824 1824 1825 1825 in
+2
pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix
··· 8 8 ; 9 9 in 10 10 { 11 + # keep-sorted start block=yes newline_separated=yes 11 12 # missing optional dependencies 12 13 haskell-tng-mode = addPackageRequires super.haskell-tng-mode ( 13 14 with self; ··· 36 35 popd 37 36 ''; 38 37 }; 38 + # keep-sorted end 39 39 }
+2
pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix
··· 46 46 commonOverrides = import ./nongnu-common-overrides.nix pkgs lib; 47 47 48 48 overrides = self: super: { 49 + # keep-sorted start block=yes newline_separated=yes 49 50 # missing optional dependencies 50 51 haskell-tng-mode = addPackageRequires super.haskell-tng-mode [ 51 52 self.shut-up 52 53 self.lsp-mode 53 54 ]; 55 + # keep-sorted end 54 56 }; 55 57 56 58 in
+4 -1
pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix
··· 41 41 42 42 commonOverrides = import ./nongnu-common-overrides.nix pkgs lib; 43 43 44 - overrides = self: super: { }; 44 + overrides = self: super: { 45 + # keep-sorted start block=yes newline_separated=yes 46 + # keep-sorted end 47 + }; 45 48 46 49 in 47 50 let