From e0a4432192badeff8415394235f7b2de04bc51ec Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 6 Aug 2021 22:24:46 +0200 Subject: [PATCH] emacs.pkgs.ada-mode: pin wisi 3.1.3 to fix build Apparently ada-mode is intended to be build with a _specific_ version of wisi which is not mentioned in the manual (as far as I am aware), but described in passing in NEWS [1]. Thus the package-overrides in ada-mode.el are to be interpreted as a strict version requirement. [1]: https://git.savannah.gnu.org/cgit/emacs/elpa.git/tree/NEWS?h=externals/ada-mode&id=a2b7ec2b4c1b6067348b1d1026dd80c133b3200d#n17 --- .../editors/emacs/elisp-packages/elpa-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2fcfa9b84dd..821960d1338 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -66,7 +66,12 @@ self: let phases = "unpackPhase " + old.phases; # not a list, interestingly… srcs = [ super.ada-mode.src - self.wisi.src + # ada-mode needs a specific version of wisi, check NEWS or ada-mode's + # package-requires to find the version to use. + (pkgs.fetchurl { + url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar.lz"; + sha256 = "18dwcc0crds7aw466vslqicidlzamf8avn59gqi2g7y2x9k5q0as"; + }) ]; sourceRoot = "ada-mode-${self.ada-mode.version}"; @@ -74,6 +79,7 @@ self: let nativeBuildInputs = [ buildPackages.gnat buildPackages.gprbuild + buildPackages.lzip ]; buildInputs = [