~ruther/guix-local

82e58c26db9ebe5ccd66fecd92aa423a42ecda87 — Efraim Flashner a month ago 3593006
guix: Spelling corrections.

* guix/gnupg.scm,
guix/import/composer.scm,
guix/import/cpan.scm,
guix/import/crate/cargo-lock.scm,
guix/import/hackage.scm,
guix/import/json.scm,
guix/licenses.scm,
guix/packages.scm,
guix/scripts/import.scm,
guix/ui.scm: Fix misspellings in comments and doc strings.

Change-Id: I8e922f8e980214e345a42a995788a7c4adb9184d
M guix/gnupg.scm => guix/gnupg.scm +1 -1
@@ 78,7 78,7 @@
(define revkeysig-rx                    ; good signature, but revoked key
  (make-regexp "^\\[GNUPG:\\] REVKEYSIG ([[:xdigit:]]+) (.*)$"))
(define errsig-rx
  ;; Note: The fingeprint part (the last element of the line) appeared in
  ;; Note: The fingerprint part (the last element of the line) appeared in
  ;; GnuPG 2.2.7 according to 'doc/DETAILS', and it may be missing.
  (make-regexp
   "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)(.*)"))

M guix/import/composer.scm => guix/import/composer.scm +1 -1
@@ 97,7 97,7 @@

(define* (composer-fetch name #:key version partial-version?)
  "Return a composer-package representation of the Composer metadata for the
package NAME with optional VERSION, or #f on failure.  VERSION may be gien as
package NAME with optional VERSION, or #f on failure.  VERSION may be given as
version prefix if PARTIAL-VERSION? is #t."
  (and-let* ((url (string-append (%composer-base-url) "/p/" name ".json"))
             (packages (and=> (json-fetch url)

M guix/import/cpan.scm => guix/import/cpan.scm +1 -1
@@ 102,7 102,7 @@
(define string->license
  (match-lambda
   ;; List of valid values from https://metacpan.org/pod/CPAN::Meta::Spec.
   ;; Some licenses are excluded based on their absense from (guix licenses).
   ;; Some licenses are excluded based on their absence from (guix licenses).
   ("agpl_3" 'agpl3)
   ;; apache_1_1
   ("apache_2_0" 'asl2.0)

M guix/import/crate/cargo-lock.scm => guix/import/crate/cargo-lock.scm +1 -1
@@ 35,7 35,7 @@
(define (cargo-lock-string->scm str)
  (peg:tree (search-for-pattern cargo-lock str)))

;; Auxiliar peg patterns
;; Auxiliary peg patterns
(define-peg-pattern numeric-char body
  (range #\0 #\9))


M guix/import/hackage.scm => guix/import/hackage.scm +1 -1
@@ 222,7 222,7 @@ object."
(define (filter-dependencies dependencies own-names)
  "Filter the dependencies included with the GHC compiler from DEPENDENCIES, a
list with the names of dependencies.  OWN-NAMES is the name of the Cabal
package being processed and its internal libaries and is used to filter
package being processed and its internal libraries and is used to filter
references to itself."
  (let ((ignored-dependencies (map string-downcase
                                   (append own-names ghc-standard-libraries))))

M guix/import/json.scm => guix/import/json.scm +1 -1
@@ 57,7 57,7 @@ enable caching, supply 'http-fetch/cached'."
      result)))

(define (json->code file-name)
  "Read FILE-NAME containing one ore more JSON package definitions and return
  "Read FILE-NAME containing one or more JSON package definitions and return
a list of S-expressions, or return #F when the JSON is invalid."
  (catch 'json-invalid
    (lambda ()

M guix/licenses.scm => guix/licenses.scm +1 -1
@@ 307,7 307,7 @@ at URI, which may be a file:// URI pointing the package's tree."
           "https://www.gnu.org/licenses/license-list#CDDL"))

;; CDDL1.1 is the same as 1.0, except that "Sun Microsystems, Inc" becomes "Oracle",
;; "LOST PROFITS" becoms "LOSS OF GOODWILL" and a section is added between 6.2
;; "LOST PROFITS" becomes "LOSS OF GOODWILL" and a section is added between 6.2
;; and 6.3.
(define cddl1.1
  (license "CDDL 1.1"

M guix/packages.scm => guix/packages.scm +1 -1
@@ 243,7 243,7 @@ representation."
(define-compile-time-decoder base32 nix-base32-string->bytevector)
(define-compile-time-decoder base64 base64-decode)

;; Crytographic content hash.
;; Cryptographic content hash.
(define-immutable-record-type <content-hash>
  (%content-hash algorithm value)
  content-hash?

M guix/scripts/import.scm => guix/scripts/import.scm +1 -1
@@ 122,7 122,7 @@ PROC callback."

  (define (process-args args)
    (match args
      ;; Workaround to accpet ‘--insert=FILE’, for the consistency of
      ;; Workaround to accept ‘--insert=FILE’, for the consistency of
      ;; command-line interface.
      ((arg . rest)
       (if (string-prefix? "--insert=" arg)

M guix/ui.scm => guix/ui.scm +1 -1
@@ 319,7 319,7 @@ VARIABLE and return it, or #f if none was found."
(define %hint-color (color BOLD CYAN))

(define (texinfo-quote str)
  "Quote at signs and braces in STR to obtain its Texinfo represention."
  "Quote at signs and braces in STR to obtain its Texinfo representation."
  (list->string
   (string-fold-right (lambda (chr result)
                        (if (memq chr '(#\@ #\{ #\}))