From b011b33e427cfedcd68d673549fb8e9f9850faf2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 8 Nov 2021 18:07:11 +0100 Subject: [PATCH] emacs.pkgs.ada-mode: use latest wisi By upgrading the AdaCore libraries to their 22.*.* versions and GNAT to version 11 we can finally upgrade wisi beyond 3.1.5 and probably (hopefully) stay on latest for some time. --- .../editors/emacs/elisp-packages/elpa-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index b7f861a4cd7a..60fac91839a1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -36,14 +36,16 @@ self: let inherit (self) emacs; }; + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + generateElpa = lib.makeOverridable ({ generated ? ./elpa-generated.nix }: let imported = import generated { callPackage = pkgs: args: self.callPackage pkgs (args // { - # Use custom elpa url fetcher with fallback/uncompress - fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + inherit fetchurl; }); }; @@ -69,12 +71,7 @@ self: let dontUnpack = false; srcs = [ super.ada-mode.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"; - }) + self.wisi.src ]; sourceRoot = "ada-mode-${self.ada-mode.version}";