diff options
| author | Daniël de Kok <me@danieldk.eu> | 2021-05-03 19:47:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 19:47:02 +0200 |
| commit | cc3609a59c16e4104c6cae987123885b57cd997c (patch) | |
| tree | 9c3d12b61874acc140cf15ffdb24648ebb37a3bb | |
| parent | f7906ec8b2978b78d6e541716b1f949fbc045849 (diff) | |
| parent | 54a540c448baa5b06f64525d57043b41d721343d (diff) | |
Merge pull request #120354 from kennyballou/update-emacs2nix
Update emacs2nix and update-melpa.el
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/emacs2nix.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/update-melpa.el | 5 |
2 files changed, 6 insertions, 3 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 { 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" |