diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-10 12:02:02 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-10 12:02:02 +0000 |
commit | 30da98a1d692be9190a3fdf3225884813c964908 (patch) | |
tree | df0720ead2cce604dd99ac0dfac90d65e8c3604f /pkgs/applications/editors/emacs/elisp-packages/update-melpa.el | |
parent | 35f45b6cb9206efe8bd9a2772ba4ec0e1fb202dc (diff) | |
parent | 02baec7992b3781086a588fa119a6a160c4a1dc3 (diff) | |
download | nixlib-30da98a1d692be9190a3fdf3225884813c964908.tar nixlib-30da98a1d692be9190a3fdf3225884813c964908.tar.gz nixlib-30da98a1d692be9190a3fdf3225884813c964908.tar.bz2 nixlib-30da98a1d692be9190a3fdf3225884813c964908.tar.lz nixlib-30da98a1d692be9190a3fdf3225884813c964908.tar.xz nixlib-30da98a1d692be9190a3fdf3225884813c964908.tar.zst nixlib-30da98a1d692be9190a3fdf3225884813c964908.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors/emacs/elisp-packages/update-melpa.el')
-rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/update-melpa.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el index 149413580856..9cb6456cd6f9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el +++ b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el @@ -6,7 +6,7 @@ (require 'semaphore-promise) (require 'url) (require 'json) -(require 'cl) +(require 'cl-lib) (require 'subr-x) (require 'seq) @@ -77,7 +77,7 @@ return Promise to resolve in that process." (defun parse-previous-archive (filename) (let ((idx (make-hash-table :test 'equal))) - (loop for desc in + (cl-loop for desc in (let ((json-object-type 'hash-table) (json-array-type 'list) (json-key-type 'symbol)) @@ -166,7 +166,7 @@ return Promise to resolve in that process." (defun recipe-info (recipe-index ename) (if-let (desc (gethash ename recipe-index)) - (destructuring-bind (rcp-commit . rcp-sha256) desc + (cl-destructuring-bind (rcp-commit . rcp-sha256) desc `((commit . ,rcp-commit) (sha256 . ,rcp-sha256))) `((error . "No recipe info")))) @@ -204,7 +204,7 @@ return Promise to resolve in that process." (seq-let [recipe-index unstable-sha stable-sha] res (append `((ename . ,ename)) (if-let (desc (gethash ename recipe-index)) - (destructuring-bind (rcp-commit . rcp-sha256) desc + (cl-destructuring-bind (rcp-commit . rcp-sha256) desc (append `((commit . ,rcp-commit) (sha256 . ,rcp-sha256)) (when (not unstable-aprops) @@ -257,10 +257,9 @@ return Promise to resolve in that process." url (lambda (status) (funcall resolve (condition-case err (progn - (goto-char (point-min)) - (search-forward "\n\n") + (url-http-parse-headers) + (goto-char url-http-end-of-headers) (message (buffer-substring (point-min) (point))) - (delete-region (point-min) (point)) (funcall parser)) (funcall reject err)))))))) |