From a860a2fec866f0b22504d04b4bb0df8f8255b64a Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Wed, 21 Aug 2024 23:30:15 +1000 Subject: [PATCH] Drop magit pin again Whoops: I assumed the melpa branch HEAD Doom was using was actually working for Doom, but it stopped working with straight.el after that branch was regenerated after an update to the main branch. Should have tested / reported upstream. Doom pinned git-commit to the main branch HEAD and magit to the melpa branch HEAD~1, which results in the same commit, so I can drop this again (and have to, to pull in the git-commit update...). --- fetch-overrides.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/fetch-overrides.nix b/fetch-overrides.nix index cc1b061..81e438b 100644 --- a/fetch-overrides.nix +++ b/fetch-overrides.nix @@ -41,15 +41,5 @@ sly-stepper = "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e"; # In emacsattic, so shouldn't change underneath us. ammonite-term-repl = "b552fe21977e005c1c460bf6607557e67241a6b6"; - - # Doom pinned magit to a different revision than git-commit. - # They are built from the same repository, which means we require the commits match. - # - # Doom's pin of magit (cf94190410ef163fd102cdbcb67f28599d31eabc) has the git-commit pin as - # parent, and looks like it adds prebuilt documentation for use from Melpa. - # Use the git-commit commit, since our derivation should be able to build the documentation. - # - # TODO: consider allowing git-commit and magit pins to deviate? - magit = "55656a31cc4fe6c8996c621f4cf14aa4a1bfe47d"; }; }