Emacs: Use official MELPA domain

master
Pierre Neidhardt 2018-10-25 20:11:32 +02:00
parent 11719e66bb
commit 580b3214f0
1 changed files with 2 additions and 7 deletions

View File

@ -35,17 +35,12 @@
(setq user-emacs-directory "~/.cache/emacs/") (setq user-emacs-directory "~/.cache/emacs/")
(when (require 'package nil t) (when (require 'package nil t)
;; TODO: MELPA's https sometimes return ;; Different Emacs versions have different byte code. If a versioned ELPA
;; emacs melpa invalid: certificate host does not match hostname
;; Try the following:
;; (setq tls-checktrust nil)
;; Different Emacs version have different byte code. If a versioned ELPA
;; directory is found, use it. ;; directory is found, use it.
(let ((versioned-dir (format "elpa-%s.%s" emacs-major-version emacs-minor-version))) (let ((versioned-dir (format "elpa-%s.%s" emacs-major-version emacs-minor-version)))
(when (member versioned-dir (directory-files (expand-file-name ".." package-user-dir))) (when (member versioned-dir (directory-files (expand-file-name ".." package-user-dir)))
(setq package-user-dir (expand-file-name (concat "../" versioned-dir) package-user-dir)))) (setq package-user-dir (expand-file-name (concat "../" versioned-dir) package-user-dir))))
(setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/"))) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
(add-to-list 'package-archives '("melpa" . "https://melpa.milkbox.net/packages/"))
(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t) (add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t)
(package-initialize)) (package-initialize))