me
/
guix
Archived
1
0
Fork 0
Code

import: Move string->license to importers. 

* guix/import/gem.scm (string->license): Move from (guix import utils).
* guix/import/pypi.scm (string->license): Move from (guix import utils).
master
David Craven 2016-09-22 11:30:17 +02:00
parent fbe9c10128
commit 263ac57fc2
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/import/gem.scm
View File

@ -29,7 +29,7 @@
#:use-module (guix import json) #:use-module (guix import json)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix upstream) #:use-module (guix upstream)
#:use-module (guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix base32) #:use-module (guix base32)
#:use-module (guix build-system ruby) #:use-module (guix build-system ruby)
#:export (gem->guix-package #:export (gem->guix-package
@ -155,6 +155,17 @@ package on RubyGems."
;; e.g. "https://rubygems.org/downloads/hashery-2.1.1.gem" ;; e.g. "https://rubygems.org/downloads/hashery-2.1.1.gem"
(substring source-url 31 (string-rindex source-url #\-)))) (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) (define (gem-package? package)
"Return true if PACKAGE is a gem package from RubyGems." "Return true if PACKAGE is a gem package from RubyGems."

13
guix/import/pypi.scm
View File

@ -41,7 +41,7 @@
#:use-module (guix import json) #:use-module (guix import json)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix upstream) #:use-module (guix upstream)
#:use-module (guix licenses) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:export (guix-package->pypi-name #:export (guix-package->pypi-name
@ -294,6 +294,17 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
(make-pypi-sexp name version release wheel home-page synopsis (make-pypi-sexp name version release wheel home-page synopsis
description license)))))) 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) (define (pypi-package? package)
"Return true if PACKAGE is a Python package from PyPI." "Return true if PACKAGE is a Python package from PyPI."

9
guix/import/utils.scm
View File

@ -35,7 +35,6 @@
url-fetch url-fetch
guix-hash-url guix-hash-url
string->license
license->symbol license->symbol
snake-case snake-case
@ -110,15 +109,7 @@ recursively apply the procedure to the sub-list."
"Return the hash of FILENAME in nix-base32 format." "Return the hash of FILENAME in nix-base32 format."
(bytevector->nix-base32-string (file-sha256 filename))) (bytevector->nix-base32-string (file-sha256 filename)))
(define (string->license str)
"Convert the string STR into a license object."
(match str (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))) (_ #f)))
(define (license->symbol license) (define (license->symbol license)