From 5497709d8b5bb7606298f1af435961177c5330bd Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 10 Dec 2021 17:27:12 +0200 Subject: [PATCH] add format-all override to fix `+format` module Doom uses an older version of format-all[1] before breaking changes were made upstream. We need to also use this version to not have a broken experience. [1] https://github.com/hlissner/doom-emacs/blob/develop/modules/editor/format/packages.el#L4 --- flake.lock | 18 ++++++++++++++++++ flake.nix | 2 ++ overrides.nix | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index 41c367e..d69a63f 100644 --- a/flake.lock +++ b/flake.lock @@ -144,6 +144,23 @@ "type": "github" } }, + "format-all": { + "flake": false, + "locked": { + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + }, + "original": { + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + } + }, "nix-straight": { "flake": false, "locked": { @@ -299,6 +316,7 @@ "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", "flake-utils": "flake-utils", + "format-all": "format-all", "nix-straight": "nix-straight", "nixpkgs": "nixpkgs", "nose": "nose", diff --git a/flake.nix b/flake.nix index 8d259df..4c81637 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,8 @@ revealjs.flake = false; rotate-text.url = "github:debug-ito/rotate-text.el"; rotate-text.flake = false; + format-all.url = "github:lassik/emacs-format-all-the-code/47d862d40a088ca089c92cd393c6dca4628f87d3"; + format-all.flake = false; nixpkgs.url = "nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; diff --git a/overrides.nix b/overrides.nix index b0fcd66..86a7b1e 100644 --- a/overrides.nix +++ b/overrides.nix @@ -107,6 +107,10 @@ self: super: { pname = "ob-racket"; }; + format-all = self.straightBuild { + pname = "format-all"; + }; + # dune has a nontrivial derivation, which does not buildable from the melpa # wrapper falling back to the one in nixpkgs dune = ocamlPackages.dune_2.overrideAttrs (old: {