emacs.pkgs.elpaPackages/nongnuPackages: Use custom elpa fetcher

This commit is contained in:
adisbladis 2021-08-06 16:26:09 -05:00
parent 3c496d2244
commit 24d0269574
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
3 changed files with 12 additions and 5 deletions

View file

@ -41,7 +41,10 @@ self: let
}: let
imported = import generated {
inherit (self) callPackage;
callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
});
};
super = removeAttrs imported [ "dash" ];

View file

@ -10,7 +10,7 @@ To update the list of packages from nongnu (ELPA),
*/
{ lib }:
{ lib, buildPackages }:
self: let
@ -19,7 +19,10 @@ self: let
}: let
imported = import generated {
inherit (self) callPackage;
callPackage = pkgs: args: self.callPackage pkgs (args // {
# Use custom elpa url fetcher with fallback/uncompress
fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
});
};
super = imported;

View file

@ -35,7 +35,8 @@ let
inherit lib;
};
mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix {
mkNongnuPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix {
inherit (pkgs) buildPackages;
inherit lib;
};
@ -62,7 +63,7 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
pkgs ? pkgs'
, lib ? pkgs.lib
, elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
, nongnuPackages ? mkNongnuPackages { inherit lib; } self
, nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
, orgPackages ? mkOrgPackages { inherit lib; } self