diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/emacs.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-patches-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6fb323deaf..ca14584ada 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -314,7 +314,7 @@ languages.") (files '("share/info")))))))) (define-public emacs-next-pgtk - (let ((commit "3df4ca451d41a5f1036713277ef55ca9734c6fa7") + (let ((commit "d46a223d8595e8edb67c6361033625797503cacf") (revision "0")) (package/inherit emacs-next (name "emacs-next-pgtk") @@ -323,12 +323,12 @@ languages.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/masm11/emacs") + (url "https://git.savannah.gnu.org/git/emacs.git/") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1c677c97b9avhlzysg09cvf6bd69iz41ggppnszw8chhphk3knfc")))) + "1fhkgqsdpy3qkf8wyjvavnfyh8byxh0h80n0448rkg9k0lrkl4wf")))) (arguments (substitute-keyword-arguments (package-arguments emacs-next) ((#:configure-flags flags ''()) |