From 69559a006c28f295602d89e54c36e8463807861a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 29 Nov 2015 16:47:11 +0100
Subject: Emacs: Revert to http package fetching

Marmalade’s TLS certificate doesn’t seem to be trusted, so I can’t use
it.
---
 tag-emacs/emacs.d/init.org | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index eed4b390..8e8db1c6 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -32,24 +32,11 @@ the buffer to be empty.
 ** Use-package
 
 #+BEGIN_SRC emacs-lisp
-  (let ((trustfile
-         (replace-regexp-in-string
-          "\\\\" "/"
-          (replace-regexp-in-string
-           "\n" ""
-           (shell-command-to-string "python -m certifi")))))
-    (setq tls-checktrust t
-          tls-program
-          (list
-           (format "gnutls-cli%s --x509cafile %s -p %%p %%h"
-                   (if (eq window-system 'w32) ".exe" "") trustfile)))
-    (setq gnutls-verify-error t)
-    (setq gnutls-trustfiles (list trustfile)))
   (eval-and-compile
-    (setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
-                             ("marmalade" . "https://marmalade-repo.org/packages/")
-                             ("melpa" . "https://melpa.org/packages/")
-                             ("melpa-stable" . "https://stable.melpa.org/packages/"))
+    (setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
+                             ("marmalade" . "http://marmalade-repo.org/packages/")
+                             ("melpa-stable" . "http://stable.melpa.org/packages/")
+                             ("melpa" . "http://melpa.org/packages/"))
           package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa"))
     (package-initialize)
     (unless (package-installed-p 'use-package)
-- 
cgit 1.4.1