logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix flake update

Browse source 
Drop url overrides no longer needed because Doom now points at
emacsmirror.

The URL overrides weren't breaking things, because emacsmirror mirrors
these repositories unmodified (the commit Doom pins is present in both).
This commit is contained in:
Marien Zwart 2024-03-05 22:46:15 +11:00
parent c50ceed902
commit a9e5dbe1a3
No known key found for this signature in database
2 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
flake.lock generated
View file

@ -3,11 +3,11 @@
"doomemacs": { "doomemacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1709171466, "lastModified": 1709619669,
"narHash": "sha256-Th+aCtv3XX2vnvsPgY9lcASZzQpvClsDu1U+z1WGpno=", "narHash": "sha256-XbohD+bCpB9xNIqmmPvauqEA7gPBs/7mDhJ7kKdUFsM=",
"owner": "doomemacs", "owner": "doomemacs",
"repo": "doomemacs", "repo": "doomemacs",
"rev": "35dc13632b3177b9efedad212f2180f69e756853", "rev": "bea81278fd2ecb65db6a63dbcd6db2f52921ee41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1709516695, "lastModified": 1709629551,
"narHash": "sha256-oymuRjQUhUx71xb4N1P9QFx+OmpnSF3pJKU1tsZBlE8=", "narHash": "sha256-G+nZqqGVtMdDNhbaFeT9u2FhjUt7/lh28pB5Grd1WFg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "dcb6c5cc11efa3ab804960537242217cf335b230", "rev": "5a24cf5100cd2584313119d0f4d413417fec949c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709237383, "lastModified": 1709479366,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,10 +122,10 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709309926, "lastModified": 1709569716,
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=", "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=",
"path": "/nix/store/3i3rncs75fid9hwai5p2nvwc4ngdnia7-source", "path": "/nix/store/h947mznq84fnw1igj3jgyisswqfma0hi-source",
"rev": "79baff8812a0d68e24a836df0a364c678089e2c7", "rev": "617579a787259b9a6419492eaac670a5f7663917",
"type": "path" "type": "path"
}, },
"original": { "original": {

17
package.nix
View file

@ -68,17 +68,30 @@ let
nose = "https://github.com/emacsattic/nose.git"; nose = "https://github.com/emacsattic/nose.git";
# In nixpkgs, but uses codeberg, for which nixpkgs uses fetchzip. # In nixpkgs, but uses codeberg, for which nixpkgs uses fetchzip.
# TODO: consider parsing origEPkg.src.url instead. # TODO: consider parsing origEPkg.src.url instead.
spell-fu = "https://codeberg.org/ideasman42/emacs-spell-fu.git";
tree-sitter-indent = "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git"; tree-sitter-indent = "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git";
undo-fu = "https://codeberg.org/ideasman42/emacs-undo-fu.git"; undo-fu = "https://codeberg.org/ideasman42/emacs-undo-fu.git";
undo-fu-session = "https://codeberg.org/ideasman42/emacs-undo-fu-session.git"; undo-fu-session = "https://codeberg.org/ideasman42/emacs-undo-fu-session.git";
visual-fill-column = "https://codeberg.org/joostkremers/visual-fill-column.git";
}; };
doomEmacsPackages = (emacsPackagesFor emacs).overrideScope ( doomEmacsPackages = (emacsPackagesFor emacs).overrideScope (
eself: esuper: eself: esuper:
let let
customPackages = callPackages ./elisp-packages.nix { inherit emacs esuper eself; }; customPackages = callPackages ./elisp-packages.nix { inherit emacs esuper eself; };
# Current problem:
#
# Unable to activate package ‘with-editor’.
# Required package ‘compat-29.1.4.1’ is unavailable
# Unable to activate package ‘vertico’.
# Required package ‘compat-29.1.4.4’ is unavailable
#
# and so forth. Nixpkgs may be installing ELPA packages in a way that
# requires their ELPA dependencies to be installed with metadata my
# hacks do not provide.
#
# except vertico is pinned...
#
# emacs-exunit> Unable to activate package `transient'.
# emacs-exunit> Required package `compat-29.1.4.4' is unavailable
makePackage = name: p: makePackage = name: p:
assert lib.asserts.assertEachOneOf assert lib.asserts.assertEachOneOf