Commit 6d1296e8 authored by adisbladis's avatar adisbladis
Browse files

emacs.pkgs.melpaPackages: Refactor internal melpaDerivation fetcher invocation 

The previous behaviour resulted in the fetchers being recreated for every call to melpaDerivation, now we amortize that.
The performance impact is tiny but I think this is much more readable.
parent dcd0434d

pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix

+94 −57
Original line number Diff line number Diff line
@@ -2,61 +2,98 @@ lib: self: 


let



    fetcherGenerators = { repo ? null

                        , url ? null

                        , ... }:

                        { sha256

                        , commit

                        , ...}: {

      github = self.callPackage ({ fetchFromGitHub }:

  fetchers = lib.mapAttrs (_: fetcher: self.callPackage fetcher { }) {

    github =

      { fetchFromGitHub }:

      {

        repo ? null,

        ...

      }:

      { sha256, commit, ... }:

      fetchFromGitHub {

        owner = lib.head (lib.splitString "/" repo);

        repo = lib.head (lib.tail (lib.splitString "/" repo));

        rev = commit;

        inherit sha256;

        }

      ) {};

      gitlab = self.callPackage ({ fetchFromGitLab }:

      };



    gitlab =

      { fetchFromGitLab }:

      {

        repo ? null,

        ...

      }:

      { sha256, commit, ... }:

      fetchFromGitLab {

        owner = lib.head (lib.splitString "/" repo);

        repo = lib.head (lib.tail (lib.splitString "/" repo));

        rev = commit;

        inherit sha256;

        }

      ) {};

      git = self.callPackage ({ fetchgit }:

      };



    git = (

      { fetchgit }:

      {

        url ? null,

        ...

      }:

      { sha256, commit, ... }:

      (fetchgit {

        rev = commit;

        inherit sha256 url;

      }).overrideAttrs(_: {

        GIT_SSL_NO_VERIFY = true;

      })

      ) {};

      bitbucket = self.callPackage ({ fetchhg }:

    );



    bitbucket =

      { fetchhg }:

      {

        repo ? null,

        ...

      }:

      { sha256, commit, ... }:

      fetchhg {

        rev = commit;

        url = "https://bitbucket.com/${repo}";

        inherit sha256;

        }

      ) {};

      hg = self.callPackage ({ fetchhg }:

      };



    hg =

      { fetchhg }:

      {

        url ? null,

        ...

      }:

      { sha256, commit, ... }:

      fetchhg {

        rev = commit;

        inherit sha256 url;

        }

      ) {};

      sourcehut = self.callPackage ({ fetchzip }:

      };



    sourcehut =

      { fetchzip }:

      {

        repo ? null,

        ...

      }:

      { sha256, commit, ... }:

      fetchzip {

        url = "https://git.sr.ht/~${repo}/archive/${commit}.tar.gz";

        inherit sha256;

        }

      ) {};

      codeberg = self.callPackage ({ fetchzip }:

      };



    codeberg =

      { fetchzip }:

      {

        repo ? null,

        ...

      }:

      { sha256, commit, ... }:

      fetchzip {

        url = "https://codeberg.org/${repo}/archive/${commit}.tar.gz";

        inherit sha256;

        }

      ) {};

      };

  };



in {
@@ -88,7 +125,7 @@ in { 
                (builtins.filter (n: n >= 0) version)));

            # TODO: Broken should not result in src being null (hack to avoid eval errors)

            src = if (sha256 == null || broken) then null else

              lib.getAttr fetcher (fetcherGenerators args sourceArgs);

              fetchers.${fetcher} args sourceArgs;

            recipe = if commit == null then null else

              fetchurl {

                name = pname + "-recipe";