This adds a key VERSION to 'recursive-import' and moves the parameter REPO to a key. This also changes all the places that rely on 'recursive-import'. * guix/import/utils.scm (recursive-import): Add the VERSION key. Make REPO a key. (package->definition): Add optional 'append-version?'. * guix/scripts/import/crate.scm (guix-import-crate): Add the VERSION key. * guix/import/crate.scm (crate->guix-package): Add the VERSION key. (crate-recursive-import): Pass VERSION to recursive-import, remove now unnecessary code. * guix/import/cran.scm (cran->guix-package, cran-recursive-import): Change the REPO parameter to a key. * guix/import/elpa.scm (elpa->guix-package, elpa-recursive-import): Likewise. * guix/import/gem.scm (gem->guix-package, recursive-import): Likewise. * guix/import/opam.scm (opam-recurive-import): Likewise. * guix/import/pypi.scm (pypi-recursive-import): Likewise. * guix/import/stackage.scm (stackage-recursive-import): Likewise. * guix/scripts/import/cran.scm (guix-import-cran): Likewise. * guix/scripts/import/elpa.scm (guix-import-elpa): Likewise. * tests/elpa.scm (eval-test-with-elpa): Likewise. * tests/import-utils.scm (recursive-import): Likewise. Co-authored-by: Hartmut Goebel <h.goebel@crazy-compilers.com>
		
			
				
	
	
		
			81 lines
		
	
	
	
		
			2.8 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
			
		
		
	
	
			81 lines
		
	
	
	
		
			2.8 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
| ;;; GNU Guix --- Functional package management for GNU
 | |
| ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 | |
| ;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
 | |
| ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 | |
| ;;;
 | |
| ;;; This file is part of GNU Guix.
 | |
| ;;;
 | |
| ;;; GNU Guix is free software; you can redistribute it and/or modify it
 | |
| ;;; under the terms of the GNU General Public License as published by
 | |
| ;;; the Free Software Foundation; either version 3 of the License, or (at
 | |
| ;;; your option) any later version.
 | |
| ;;;
 | |
| ;;; GNU Guix is distributed in the hope that it will be useful, but
 | |
| ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
| ;;; GNU General Public License for more details.
 | |
| ;;;
 | |
| ;;; You should have received a copy of the GNU General Public License
 | |
| ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 | |
| 
 | |
| (define-module (test-elpa)
 | |
|   #:use-module (guix import elpa)
 | |
|   #:use-module (guix tests http)
 | |
|   #:use-module (srfi srfi-1)
 | |
|   #:use-module (srfi srfi-64)
 | |
|   #:use-module (ice-9 match)
 | |
|   #:use-module (web client))
 | |
| 
 | |
| (define elpa-mock-archive
 | |
|   '(1
 | |
|     (ace-window .
 | |
|                 [(0 9 0)
 | |
|                  ((avy
 | |
|                    (0 2 0)))
 | |
|                  "Quickly switch windows." single
 | |
|                  ((:url . "https://github.com/abo-abo/ace-window")
 | |
|                   (:keywords "window" "location"))])
 | |
|     (auctex .
 | |
|             [(11 88 6)
 | |
|              nil "Integrated environment for *TeX*" tar
 | |
|              ((:url . "http://www.gnu.org/software/auctex/"))])))
 | |
| 
 | |
| ;; Avoid collisions with other tests.
 | |
| (%http-server-port 10300)
 | |
| 
 | |
| (test-begin "elpa")
 | |
| 
 | |
| (define (eval-test-with-elpa pkg)
 | |
|   ;; Set up an HTTP server and use it as a pseudo-proxy so that
 | |
|   ;; 'elpa->guix-package' talks to it.
 | |
|   (with-http-server `((200 ,(object->string elpa-mock-archive))
 | |
|                       (200 "This is the description.")
 | |
|                       (200 "fake tarball contents"))
 | |
|     (parameterize ((current-http-proxy (%local-url)))
 | |
|       (match (elpa->guix-package pkg #:repo 'gnu/http)
 | |
|         (('package
 | |
|            ('name "emacs-auctex")
 | |
|            ('version "11.88.6")
 | |
|            ('source
 | |
|             ('origin
 | |
|               ('method 'url-fetch)
 | |
|               ('uri ('string-append
 | |
|                      "http://elpa.gnu.org/packages/auctex-" 'version ".tar"))
 | |
|               ('sha256 ('base32 (? string? hash)))))
 | |
|            ('build-system 'emacs-build-system)
 | |
|            ('home-page "http://www.gnu.org/software/auctex/")
 | |
|            ('synopsis "Integrated environment for *TeX*")
 | |
|            ('description "This is the description.")
 | |
|            ('license 'license:gpl3+))
 | |
|          #t)
 | |
|         (x
 | |
|          (pk 'fail x #f))))))
 | |
| 
 | |
| (test-assert "elpa->guix-package test 1"
 | |
|   (eval-test-with-elpa "auctex"))
 | |
| 
 | |
| (test-end "elpa")
 | |
| 
 | |
| ;; Local Variables:
 | |
| ;; eval: (put 'with-http-server 'scheme-indent-function 1)
 | |
| ;; End:
 |