emacs: refactor: fetchzip→fetchgit
In preparation for fetching pre-releases, which are not available in the standard GNU mirrors, just in the ‘alpha’ ones. srcRepo has been flipped, since repo states do not include the autoconf/automake generated files of the release tarballs. emacs-macport, which was already built from repo sources, had to enable srcRepo, which the flip makes it redundant, and hence is gone.
This commit is contained in:
@@ -13,7 +13,7 @@ lib.makeScope pkgs.newScope (
|
||||
inherit lib;
|
||||
inherit (pkgs)
|
||||
fetchFromGitHub
|
||||
fetchzip
|
||||
fetchgit
|
||||
;
|
||||
};
|
||||
|
||||
@@ -31,11 +31,6 @@ lib.makeScope pkgs.newScope (
|
||||
withPgtk = true;
|
||||
};
|
||||
|
||||
emacs30-macport = callPackage (self.sources.emacs30-macport) (
|
||||
inheritedArgs
|
||||
// {
|
||||
srcRepo = true;
|
||||
}
|
||||
);
|
||||
emacs30-macport = callPackage (self.sources.emacs30-macport) inheritedArgs;
|
||||
}
|
||||
)
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
# Boolean flags
|
||||
withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
|
||||
noGui ? false,
|
||||
srcRepo ? false,
|
||||
srcRepo ? true,
|
||||
withAcl ? false,
|
||||
withAlsaLib ? false,
|
||||
withAthena ? false,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
fetchgit,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -26,9 +26,9 @@ let
|
||||
src =
|
||||
{
|
||||
"mainline" = (
|
||||
fetchzip {
|
||||
url = "mirror://gnu/emacs/${rev}.tar.xz";
|
||||
inherit hash;
|
||||
fetchgit {
|
||||
url = "https://https.git.savannah.gnu.org/git/emacs.git";
|
||||
inherit rev hash;
|
||||
}
|
||||
);
|
||||
"macport" = (
|
||||
|
||||
Reference in New Issue
Block a user