mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
e6223017d9
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>.
|
||
|---|---|---|
| .. | ||
| keys | ||
| services | ||
| accounts.scm | ||
| base16.scm | ||
| base32.scm | ||
| base64.scm | ||
| boot-parameters.scm | ||
| bournish.scm | ||
| build-emacs-utils.scm | ||
| build-utils.scm | ||
| builders.scm | ||
| cache.scm | ||
| challenge.scm | ||
| channels.scm | ||
| combinators.scm | ||
| containers.scm | ||
| cpan.scm | ||
| cpio.scm | ||
| cran.scm | ||
| crate.scm | ||
| cve-sample.json | ||
| cve.scm | ||
| debug-link.scm | ||
| derivations.scm | ||
| discovery.scm | ||
| egg.scm | ||
| elm.scm | ||
| elpa.scm | ||
| file-systems.scm | ||
| gem.scm | ||
| gexp.scm | ||
| git-authenticate.scm | ||
| git.scm | ||
| glob.scm | ||
| gnu-maintenance.scm | ||
| go.scm | ||
| grafts.scm | ||
| graph.scm | ||
| gremlin.scm | ||
| guix-archive.sh | ||
| guix-authenticate.sh | ||
| guix-build-branch.sh | ||
| guix-build.sh | ||
| guix-daemon.sh | ||
| guix-describe.sh | ||
| guix-download.sh | ||
| guix-environment-container.sh | ||
| guix-environment.sh | ||
| guix-gc.sh | ||
| guix-git-authenticate.sh | ||
| guix-graph.sh | ||
| guix-hash.sh | ||
| guix-home.sh | ||
| guix-lint.sh | ||
| guix-pack-localstatedir.sh | ||
| guix-pack-relocatable.sh | ||
| guix-pack.sh | ||
| guix-package-aliases.sh | ||
| guix-package-net.sh | ||
| guix-package.sh | ||
| guix-refresh.sh | ||
| guix-repl.sh | ||
| guix-shell-export-manifest.sh | ||
| guix-shell.sh | ||
| guix-style.sh | ||
| guix-system.sh | ||
| hackage.scm | ||
| hexpm.scm | ||
| home-import.scm | ||
| home-services.scm | ||
| http-client.scm | ||
| import-git.scm | ||
| import-github.scm | ||
| import-utils.scm | ||
| inferior.scm | ||
| ipfs.scm | ||
| lint.scm | ||
| minetest.scm | ||
| modules.scm | ||
| monads.scm | ||
| nar.scm | ||
| networking.scm | ||
| offload.scm | ||
| opam.scm | ||
| openpgp.scm | ||
| pack.scm | ||
| packages.scm | ||
| pki.scm | ||
| print.scm | ||
| processes.scm | ||
| profiles.scm | ||
| publish.scm | ||
| pypi.scm | ||
| read-print.scm | ||
| records.scm | ||
| rpm.scm | ||
| scripts.scm | ||
| search-paths.scm | ||
| services.scm | ||
| sets.scm | ||
| size.scm | ||
| status.scm | ||
| store-database.scm | ||
| store-deduplication.scm | ||
| store-roots.scm | ||
| store.scm | ||
| style.scm | ||
| substitute.scm | ||
| swh.scm | ||
| syscalls.scm | ||
| system.scm | ||
| test.drv | ||
| texlive.scm | ||
| transformations.scm | ||
| ui.scm | ||
| union.scm | ||
| upstream.scm | ||
| utils.scm | ||
| uuid.scm | ||
| workers.scm | ||