2016-03-09 14:08:00 +00:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
upstream: Replace 'input-changes' field by 'inputs'.
Returning the expected list of inputs rather than changes relative to
the current package definition is less ambiguous and offers more
possibilities for further processing.
* guix/upstream.scm (<upstream-source>)[input-changes]: Remove.
[inputs]: New field.
(<upstream-input>): New record type.
* guix/upstream.scm (upstream-input-type-predicate)
(input-type-filter, upstream-source-regular-inputs)
(upstream-source-native-inputs, upstream-source-propagated-inputs): New
procedures.
(changed-inputs): Expect an <upstream-source> as its second argument.
Adjust accordingly.
* guix/import/pypi.scm (distribution-sha256): New procedure.
(maybe-inputs): Expect a list of <upstream-input>.
(compute-inputs): Rewrite to return a list of <upstream-input>.
(pypi-package-inputs, pypi-package->upstream-source): New procedures.
(make-pypi-sexp): Use it.
* guix/import/stackage.scm (latest-lts-release): Define 'cabal'.
Replace 'input-changes' field by 'inputs'.
* guix/scripts/refresh.scm (update-package): Use 'changed-inputs'
instead of 'upstream-source-input-changes'.
* tests/cran.scm ("description->package"): Adjust order of inputs.
* tests/pypi.scm (default-sha256, default-sha256/base32): New variables.
(foo-json): Add 'digests' entry.
("pypi->guix-package, no wheel"): Check HASH against DEFAULT-SHA256/BASE32.
("pypi->guix-package, wheels"): Likewise.
("pypi->guix-package, no usable requirement file."): Likewise.
("pypi->guix-package, package name contains \"-\" followed by digits"):
Likewise.
("package-latest-release"): New test.
* tests/upstream.scm (test-package-sexp): Remove.
("changed-inputs returns no changes"): Rewrite to use <upstream-source>.
(test-new-package-sexp): Remove.
("changed-inputs returns changes to plain input list"): Rewrite.
("changed-inputs returns changes to all plain input lists"): Likewise.
("changed-inputs returns changes to labelled input list")
("changed-inputs returns changes to all labelled input lists"): Remove.
* guix/import/cran.scm (maybe-inputs): Expect PACKAGE-INPUTS to be a
list of <upstream-input>.
(source-dir->dependencies): Return a list of <upstream-input>.
(vignette-builders): Likewise.
(uri-helper, cran-package-source-url)
(cran-package-propagated-inputs, cran-package-inputs): New procedures.
(description->package): Use them instead of local definitions.
(latest-cran-release): Replace 'input-changes' field by 'inputs'.
(latest-bioconductor-release): Likewise.
(format-inputs): Remove.
* guix/import/hackage.scm (cabal-package-inputs): New procedure.
(hackage-module->sexp): Use it.
[maybe-inputs]: Expect a list of <upstream-input>.
2023-05-15 20:37:25 +00:00
|
|
|
|
;;; Copyright © 2016, 2023 Ludovic Courtès <ludo@gnu.org>
|
2022-01-04 20:26:29 +00:00
|
|
|
|
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
|
2016-03-09 14:08:00 +00:00
|
|
|
|
;;;
|
|
|
|
|
;;; 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-upstream)
|
2022-01-04 20:26:29 +00:00
|
|
|
|
#:use-module (gnu packages base)
|
|
|
|
|
#:use-module (guix download)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix build-system gnu)
|
|
|
|
|
#:use-module (guix import print)
|
|
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
2016-03-09 14:08:00 +00:00
|
|
|
|
#:use-module (guix upstream)
|
|
|
|
|
#:use-module (guix tests)
|
2022-01-04 20:26:29 +00:00
|
|
|
|
#:use-module (srfi srfi-64)
|
|
|
|
|
#:use-module (ice-9 match))
|
2016-03-09 14:08:00 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(test-begin "upstream")
|
|
|
|
|
|
|
|
|
|
(test-equal "coalesce-sources same version"
|
2023-05-17 15:02:16 +00:00
|
|
|
|
'((source "foo" "1"
|
|
|
|
|
("ftp://example.org/foo-1.tar.xz"
|
|
|
|
|
"ftp://example.org/foo-1.tar.gz")
|
|
|
|
|
("ftp://example.org/foo-1.tar.xz.sig"
|
|
|
|
|
"ftp://example.org/foo-1.tar.gz.sig")))
|
2016-03-09 14:08:00 +00:00
|
|
|
|
|
2023-05-17 15:02:16 +00:00
|
|
|
|
(map (lambda (source)
|
|
|
|
|
`(source ,(upstream-source-package source)
|
|
|
|
|
,(upstream-source-version source)
|
|
|
|
|
,(upstream-source-urls source)
|
|
|
|
|
,(upstream-source-signature-urls source)))
|
|
|
|
|
(coalesce-sources (list (upstream-source
|
|
|
|
|
(package "foo") (version "1")
|
|
|
|
|
(urls '("ftp://example.org/foo-1.tar.gz"))
|
|
|
|
|
(signature-urls
|
|
|
|
|
'("ftp://example.org/foo-1.tar.gz.sig")))
|
|
|
|
|
(upstream-source
|
|
|
|
|
(package "foo") (version "1")
|
|
|
|
|
(urls '("ftp://example.org/foo-1.tar.xz"))
|
|
|
|
|
(signature-urls
|
|
|
|
|
'("ftp://example.org/foo-1.tar.xz.sig")))))))
|
2016-03-09 14:08:00 +00:00
|
|
|
|
|
|
|
|
|
(test-end)
|