From 46445cc334321e8323d1111ae24f079bb07c754c Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Fri, 23 Apr 2021 08:08:06 -0600 Subject: emacs2nix: update to fix gitlab archive URLs Signed-off-by: Kenny Ballou --- pkgs/applications/editors/emacs-modes/emacs2nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index e29a19713bdd9..cc82646870ca4 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "b815a9323c1f58f6c163a1f968939c57a8b6cfa0"; - sha256 = "183xlmhjmj4z2zssc0pw990h7bf3bam8zqswnf1zcsyp8z7yrl5g"; + rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923"; + sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df"; }; in pkgs.mkShell { -- cgit 1.4.1 From 54a540c448baa5b06f64525d57043b41d721343d Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Fri, 23 Apr 2021 09:32:44 -0600 Subject: update-melpa.el: update gitlab fetcher to use API URL GitLab packages were not downloading because the archive URL's used were invalid. Following the [GitLab API Docs][0], use the correct GitLab archive URL. This change is mirrored in ttuegel/emacs2nix#57. Signed-off-by: Kenny Ballou --- pkgs/applications/editors/emacs-modes/update-melpa.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/update-melpa.el b/pkgs/applications/editors/emacs-modes/update-melpa.el index b315777620ed3..c8c1bfee566ba 100644 --- a/pkgs/applications/editors/emacs-modes/update-melpa.el +++ b/pkgs/applications/editors/emacs-modes/update-melpa.el @@ -99,7 +99,10 @@ return Promise to resolve in that process." ("github" (list "nix-prefetch-url" "--unpack" (concat "https://github.com/" repo "/archive/" commit ".tar.gz"))) ("gitlab" (list "nix-prefetch-url" - "--unpack" (concat "https://gitlab.com/" repo "/repository/archive.tar.gz?ref=" commit))) + "--unpack" (concat "https://gitlab.com/api/v4/projects/" + (url-hexify-string repo) + "/repository/archive.tar.gz?ref=" + commit))) ("bitbucket" (list "nix-prefetch-hg" (concat "https://bitbucket.com/" repo) commit)) ("hg" (list "nix-prefetch-hg" -- cgit 1.4.1