Skip to content

Commit 6f34465

Browse files
committed
feat: Add priority as the 3rd arugment to source alias
1 parent d9c13d5 commit 6f34465

File tree

4 files changed

+16
-26
lines changed

4 files changed

+16
-26
lines changed

docs/content/en/DSL/_index.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ scripts.
6969

7070
# 🚩 Dependencies
7171

72-
## 🔍 **source** (`alias`)
73-
74-
## 🔍 **source** (`name` `url`)
72+
## 🔍 **source** (`alias-or-name` &optional `url` `priority`)
7573

7674
Add a package archive to install dependencies from.
7775

7876
```elisp
7977
(source "gnu")
8078
(source "gnu" "https://elpa.gnu.org/packages/")
79+
(source "gnu" "https://elpa.gnu.org/packages/" 10)
80+
(source "gnu" nil 10)
8181
```
8282

8383
Available aliases:
@@ -96,14 +96,6 @@ Available aliases:
9696
💡 Use **--insecure** to make **https** to **http**, but not recommended
9797
{{< /hint >}}
9898

99-
## 🔍 **source-priority** (`name` `priority`)
100-
101-
Set archive priority.
102-
103-
```elisp
104-
(source-priority "gnu" 5)
105-
```
106-
10799
## 🔍 **depends-on** (`package-name` `&optional minimum-version`)
108100

109101
## 🔍 **depends-on** (`package-name` `&rest recipe`)

docs/content/en/Development API/_index.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,10 @@ Alias of `files`.
440440

441441
Alias of `script`.
442442

443-
## 🔍 Function: eask-f-source (`name` &optional `location`)
443+
## 🔍 Function: eask-f-source (`name` &optional `location` `priority`)
444444

445445
Alias of `source`.
446446

447-
## 🔍 Function: eask-f-source-priority (`name` &optional `priority`)
448-
449-
Alias of `source-priority`.
450-
451447
## 🔍 Function: eask-f-depends-on (`pkg` &rest `args`)
452448

453449
Alias of `depends-on`.

lisp/_prepare.el

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ other scripts internally. See function `eask-call'.")
553553
'("package" "website-url" "keywords"
554554
"package-file" "files"
555555
"script"
556-
"source" "source-priority"
556+
"source"
557557
"depends-on" "development"
558558
"exec-paths" "load-paths")
559559
"List of Eask file keywords.")
@@ -780,8 +780,12 @@ Eask file in the workspace."
780780
(mapconcat #'identity (append (list command) args) " "))
781781
eask-scripts))
782782

783-
(defun eask-f-source (name &optional location)
784-
"Add archive NAME with LOCATION."
783+
(defun eask-f-source (name &optional location priority)
784+
"Add archive NAME alias.
785+
786+
If LOCATION is a URL string, replace the default URL from `eask-source-mapping'
787+
to it's value. Optional argument PRIORITY can be use to register to variable
788+
`package-archive-priorities'."
785789
(when (assoc name package-archives)
786790
(eask-error "Multiple definition of source `%s'" name))
787791
(setq location (or location (cdr (assq (intern name) eask-source-mapping))))
@@ -790,11 +794,9 @@ Eask file in the workspace."
790794
(gnutls-available-p)
791795
(not (eask-network-insecure-p)))
792796
(setq location (s-replace "https://" "http://" location)))
793-
(add-to-list 'package-archives (cons name location) t))
794-
795-
(defun eask-f-source-priority (archive-id &optional priority)
796-
"Add PRIORITY for to ARCHIVE-ID."
797-
(add-to-list 'package-archive-priorities (cons archive-id priority) t))
797+
(add-to-list 'package-archives (cons name location) t)
798+
(when priority
799+
(add-to-list 'package-archive-priorities (cons name priority) t)))
798800

799801
(defvar eask-depends-on-recipe-p nil
800802
"Set to t if package depends on recipe.")

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)