[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/12] import: Move string->license to importers.
From: |
David Craven |
Subject: |
[PATCH 03/12] import: Move string->license to importers. |
Date: |
Thu, 22 Sep 2016 15:18:54 +0200 |
* guix/import/gem.scm (string->license): Move from (guix import utils).
* guix/import/pypi.scm (string->license): Move from (guix import utils).
---
guix/import/gem.scm | 13 ++++++++++++-
guix/import/pypi.scm | 13 ++++++++++++-
guix/import/utils.scm | 9 ---------
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/guix/import/gem.scm b/guix/import/gem.scm
index b3a50ac..df6b498 100644
--- a/guix/import/gem.scm
+++ b/guix/import/gem.scm
@@ -28,7 +28,7 @@
#:use-module (guix import utils)
#:use-module (guix packages)
#:use-module (guix upstream)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix base32)
#:use-module (guix build-system ruby)
#:export (gem->guix-package
@@ -154,6 +154,17 @@ package on RubyGems."
;; e.g. "https://rubygems.org/downloads/hashery-2.1.1.gem"
(substring source-url 31 (string-rindex source-url #\-))))
+(define (string->license str)
+ "Convert the string STR into a license object."
+ (match str
+ ("GNU LGPL" license:lgpl2.0)
+ ("GPL" license:gpl3)
+ ((or "BSD" "BSD License") license:bsd-3)
+ ((or "MIT" "MIT license" "Expat license") license:expat)
+ ("Public domain" license:public-domain)
+ ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0)
+ (_ #f)))
+
(define (gem-package? package)
"Return true if PACKAGE is a gem package from RubyGems."
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 3f24014..60067db 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -40,7 +40,7 @@
#:use-module ((guix download) #:prefix download:)
#:use-module (guix packages)
#:use-module (guix upstream)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system python)
#:use-module (gnu packages python)
#:export (guix-package->pypi-name
@@ -293,6 +293,17 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and
LICENSE."
(make-pypi-sexp name version release wheel home-page synopsis
description license))))))
+(define (string->license str)
+ "Convert the string STR into a license object."
+ (match str
+ ("GNU LGPL" license:lgpl2.0)
+ ("GPL" license:gpl3)
+ ((or "BSD" "BSD License") license:bsd-3)
+ ((or "MIT" "MIT license" "Expat license") license:expat)
+ ("Public domain" license:public-domain)
+ ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0)
+ (_ #f)))
+
(define (pypi-package? package)
"Return true if PACKAGE is a Python package from PyPI."
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 8535841..b5dcc17 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -38,7 +38,6 @@
json-fetch
guix-hash-url
- string->license
license->symbol
snake-case
@@ -113,15 +112,7 @@ recursively apply the procedure to the sub-list."
"Return the hash of FILENAME in nix-base32 format."
(bytevector->nix-base32-string (file-sha256 filename)))
-(define (string->license str)
- "Convert the string STR into a license object."
(match str
- ("GNU LGPL" license:lgpl2.0)
- ("GPL" license:gpl3)
- ((or "BSD" "BSD License") license:bsd-3)
- ((or "MIT" "MIT license" "Expat license") license:expat)
- ("Public domain" license:public-domain)
- ((or "Apache License, Version 2.0" "Apache 2.0") license:asl2.0)
(_ #f)))
(define (license->symbol license)
--
2.9.0
- [PATCH 01/12] import: Move json-fetch to (guix import utils)., David Craven, 2016/09/22
- [PATCH 03/12] import: Move string->license to importers.,
David Craven <=
- [PATCH 02/12] import: Reorder imports in (guix import utils)., David Craven, 2016/09/22
- [PATCH 05/12] import: utils: Refactor license->symbol., David Craven, 2016/09/22
- [PATCH 11/12] gnu: Add cargo-bootstrap., David Craven, 2016/09/22
- [PATCH 07/12] import: crate: Add crate updater., David Craven, 2016/09/22
- [PATCH 09/12] gnu: Add rust-bootstrap-x86_64-1.12.0., David Craven, 2016/09/22