guix - Wojtek's customized Guix

about summary refs log tree commit diff

1-11-18tests: Adjust opam and pypi tests to simplified inputs.Ludovic Courtès * tests/opam.scm ("opam->guix-package"): Expect simplified inputs. * tests/pypi.scm ("pypi->guix-package, package name contains \"-\" followed by digits"): Likewise. 2021-10-12Merge remote-tracking branch 'origin/master' into core-updates-frozen.Mathieu Othacehe 2021-09-18tests: Allow opam test to run without networking.Ludovic Courtès Fixes a regression introduced in fc29c80b9635ff490bcc768c774442043cb1e231, where, since 'get-opam-repository' was no longer mocked, the test would try to access the actual OPAM repository through a call to 'http-fetch/cached'; this would lead to a test failure when networking is unavailable. * tests/opam.scm ("opam->guix-package"): Mock 'get-opam-repository' again. 2021-09-07Merge branch 'master' into core-updates-frozenLudovic Courtès 2021-08-21guix: opam: More flexibility in the importer.Alice BRENON * guix/scripts/import/opam.scm: Pass all instances of --repo as a list to the importer. * guix/import/opam.scm (opam-fetch): Stop expecting "expanded" repositories and call get-opam-repository instead to keep values "symbolic" as long as possible and factorize. (get-opam-repository): Use the same repository source as CLI opam does (i.e. HTTP-served index.tar.gz instead of git repositories). (find-latest-version): Be more flexible on the repositories structure instead of expecting packages/PACKAGE-NAME/PACKAGE-NAME.VERSION/. * tests/opam.scm: Update the call to opam->guix-package since repo is now expected to be a list and remove the mocked get-opam-repository deprecated by the support for local folders by the actual implementation. * doc/guix.texi: Document the new semantics and valid arguments for the --repo option. Signed-off-by: Julien Lepiller <julien@lepiller.eu> 2021-07-20import: opam: Emit new-style package inputs.Sarah Morgensen * guix/import/opam.scm (opam->guix-package): Wrap INPUTS and NATIVE-INPUTS in 'list' instead of 'quasiquote'. (dependency-list->inputs): Return a list of symbols. * tests/opam.scm ("opam->guix-package"): Adjust accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2021-05-28import: opam: Generate license for package.Xinglu Chen * guix/import/opam.scm (opam->guix-package): Generate license for the ‘license’ field. * tests/opam.scm (test-opam-file): Update accordingly. ("opam->guix-package"): Likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> 2020-12-08import: opam: Adjust test to latest 'opam->guix-package' changes.Ludovic Courtès This is a followup to a8dccd4bdc1e58219d4ba08fe1649bf0b8325f44, which broke the test. * guix/import/opam.scm (get-opam-repository): Prevent inlining. * tests/opam.scm ("opam->guix-package"): Mock 'get-opam-repository'. 2020-12-08guix: opam: Pass default repository to recursive importer.Julien Lepiller * guix/import/opam.scm (opam->guix-package): Rename #:repository key to #:repo. (opam-recursive-import): Pass #:repo keyword. * tests/opam.scm (opam->guix-package): Rename #:repository to #:repo. 2020-10-02tests: opam: Test additional syntax.Julien Lepiller * tests/opam.scm (test-comment): New test. (test-lists): Add more tests for complex list patterns. 2020-10-02tests: opam: Factorize tests.Julien Lepiller * tests/opam.scm: Remove duplicate code. 2020-01-17import: opam: Avoid uses of '@@' in tests.Ludovic Courtès * guix/import/opam.scm (string-pat, multiline-string, list-pat) (dict, condition): Export. (opam-fetch): Add optional 'repository' parameter. (opam->guix-package): Add #:repository parameter and pass it to 'opam-fetch'. * tests/opam.scm ("opam->guix-package"): Remove use of 'mock' and pass TEST-REPO to 'opam->guix-package' instead. ("parse-strings", "parse-multiline-strings") ("parse-lists", "parse-dicts", "parse-conditions"): Remove uses of '@@', which are no longer needed. 2019-09-07tests: opam: Fix input type in import test.Julien Lepiller * tests/opam.scm: Expect propagated-inputs instead of inputs.