From f6b85da0b97a1627df35025d1949e1f73b93696d Mon Sep 17 00:00:00 2001 From: Herman Rimm Date: Fri, 20 Dec 2024 18:35:03 +0100 Subject: import: utils: Move downstream-package-name to (guix utils). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/elpa.scm: Import (guix utils). * guix/import/texlive.scm: Import (guix utils). * guix/import/utils.scm (downstream-package-name): Move to ... * guix/utils.scm (downstream-package-name): ... here. Change-Id: If56a452f64ed06c8bb06a96a283a5067cb54d602 Signed-off-by: Ludovic Courtès --- guix/import/elpa.scm | 1 + guix/import/texlive.scm | 1 + guix/import/utils.scm | 9 --------- guix/utils.scm | 9 +++++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index b86a6a546b..62b1d645ac 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -44,6 +44,7 @@ (define-module (guix import elpa) #:use-module (guix git) #:use-module (guix hash) #:use-module (guix store) + #:use-module ((guix utils) #:select (downstream-package-name)) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8ce22a1d59..8e67d11c69 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -35,6 +35,7 @@ (define-module (guix import texlive) #:use-module (guix store) #:use-module (guix svn-download) #:use-module (guix upstream) + #:use-module ((guix utils) #:select (downstream-package-name)) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 popen) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0b1b3b3298..6f5efa790e 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -83,7 +83,6 @@ (define-module (guix import utils) read-lines chunk-lines - downstream-package-name guix-name recursive-import)) @@ -614,14 +613,6 @@ (define* (chunk-lines lines #:optional (pred string-null?)) (reverse res) (loop (cdr after) res)))))) -(define (downstream-package-name prefix name) - "Return the Guix package name for a given package NAME." - (string-append prefix (string-map (match-lambda - (#\_ #\-) - (#\. #\-) - (chr (char-downcase chr))) - name))) - (define-deprecated/alias guix-name downstream-package-name) (define (topological-sort nodes diff --git a/guix/utils.scm b/guix/utils.scm index 537d0490e0..2d82329cb7 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -91,6 +91,7 @@ (define-module (guix utils) %current-system %current-target-system package-name->name+version + downstream-package-name target-linux? target-hurd? system-hurd? @@ -706,6 +707,14 @@ (define* (package-name->name+version spec (idx (values (substring spec 0 idx) (substring spec (1+ idx)))))) +(define (downstream-package-name prefix name) + "Return the Guix package name for a given package NAME." + (string-append prefix (string-map (match-lambda + (#\_ #\-) + (#\. #\-) + (chr (char-downcase chr))) + name))) + (define* (target-linux? #:optional (target (or (%current-target-system) (%current-system)))) "Does the operating system of TARGET use the Linux kernel?" -- cgit v1.2.3