ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-12 09:56:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
83268 commits 1 branch 0 tags 448 MiB
Commit graph

18 commits

Author SHA1 Message Date
Sarah Morgensen
81a87222a1
import: hackage: Emit new-style package inputs. 
* guix/import/hackage.scm (hackage-module->sexp)[dependencies]
[native-dependencies]: Make into a list of symbols.
[maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'.
* tests/hackage.scm (match-ghc-foo)
(match-ghc-foo-6)
(match-ghc-foo-revision)
(match-ghc-foo-import): Adjust accordingly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2021-07-20 23:43:29 +02:00
Philip Munksgaard
dfac3e643a
import: hackage: Support "common" field and imports 
Fixes <https://issues.guix.gnu.org/48701>.

* guix/import/cabal.scm (make-cabal-parser): Modify.
(is-common): New variable.
(lex-common): New procedure.
(is-id): Modify.
(eval-cabal): Modify.
* tests/hackage.scm ("hackage->guix-package test cabal import") New test.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2021-06-25 15:12:05 +02:00
Xinglu Chen
cfec09a992
import: hackage: Prefix licenses with 'license:'. 
* guix/import/hackage.scm (string->license): Prefix the value of the license
field with ‘license:’.
* tests/hackage.scm (match-ghc-foo, match-ghc-foo-6, match-ghc-foo-revision):
Adjust accordingly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2021-05-22 23:39:27 +02:00
Robert Vollmert
b46a9b9a5e
import: hackage: Add two expected failing test cases. 
This adds failing test cases for two hackage import bugs:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25138
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35743

* tests/hackage.scm: Make comment style consistent. Add two
cabal parsing tests, marked as expected failures.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-20 14:07:01 +02:00
Robert Vollmert
ca45da9fc9
import: hackage: Handle Hackage revisions. 
Hackage packages can have metadata revisions (Cabal file only) that are
not reflected in the source archive.  The Haskell build system has
support for this, but until now the Hackage importer would create a
package based on the revised Cabal file which would then build using the
old Cabal file.

Fixes <https://bugs.gnu.org/35750>.

* guix/import/cabal.scm (<cabal-package>): Add 'revision' field.
(eval-cabal): Parse 'x-revision:' property.
* guix/import/hackage.scm (read-cabal-and-hash): New procedure.
(hackage-fetch-and-hash): New procedure.
(hackage-fetch): Rewrite using 'hackage-fetch-and-hash'.
(hackage-module->sexp): Add 'cabal-hash' argument and use it to populate
the '#:cabal-revision' argument.
(hackage->guix-package): Use the new '-and-hash' functions to get the
hash of the Cabal file and pass it to 'hackage-module->sexp'.
* guix/tests/hackage.scm: Test import of Cabal file revision.

Signed-off-by: Timothy Sample <samplet@ngyro.com>
 2019-06-13 22:18:52 -04:00
Robert Vollmert
959c9d159d
import: hackage: Parse braced properties. 
This adds partial support for Cabal properties that use curly
braces instead of the layout rule.  See for example
https://hackage.haskell.org/package/cassava/

* guix/import/cabal.scm (read-braced-value): New procedure.
(is-property): Remove.
(is-layout-property, is-braced-property): New variables.
(lex-property): Rename to...
(lex-layout-property): ... this.
(lex-braced-property, lex-property): New procedures.
(lex-token): Add call to 'lex-property'.
* guix/tests/hackage.scm: Test braced description import.
* tests/hackage.scm (test-cabal-multiline-desc): Rename to...
(test-cabal-multiline-layout): ... this.
("hackage->guix-package test multiline desc"): Rename to...
("hackage->guix-package test multiline desc (layout)"): ... this.
(test-cabal-multiline-braced): New variable.
("hackage->guix-package test multiline desc (braced)"): New test.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-02 22:16:05 +02:00
Robert Vollmert
64d3181357
tests: hackage: Test multiline cabal description. 
* tests/hackage.scm (test-cabal-multiline-desc): New variable.
("hackage->guix-package test multiline desc"): New test.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-02 22:12:19 +02:00
Robert Vollmert
ea35f5c599
tests: Fix hackage tests. 
This is a followup to 1cc12357a6.

* tests/hackage.scm: ghc-mtl is no longer added as an input.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-02 22:07:53 +02:00
Robert Vollmert
0be465924c
tests: Indent hackage tests 
* tests/hackage.scm: Reindent using etc/indent-code.el.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-01 15:26:30 +02:00
Robert Vollmert
4110cde005
tests: hackage: Don't mock hackage-fetch. 
* tests/hackage.scm: Pass a string input port to tests instead of
mocking hackage download.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-01 15:26:30 +02:00
Robert Vollmert
55c98f3261
tests: hackage: Factor out package pattern. 
* tests/hackage.scm: Import result pattern matching via helper.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2019-06-01 15:26:30 +02:00
Ludovic Courtès
ad7466aafd
import: hackage: Fix Cabal test. 
* guix/import/hackage.scm (hackage->guix-package): Remove call to 'memoize'.
(hackage->guix-package/m): New procedure.
(hackage-recursive-import): Use it.
* tests/hackage.scm ("hackage->guix-package test 6"): Adjust.

Co-authored-by: Robert Vollmert <rob@vllmrt.net>
 2019-05-26 23:20:30 +02:00
Danny Milosavljevic
e39a44f340
import: hackage: Evaluate "-any" and "-none" version comparison operators. 
* guix/import/cabal.scm (eval-cabal): Modify.
* tests/hackage.scm (test-cabal-4): New variable and test.
(test-cabal-5): New variable and test.
(test-cabal-6): New variable and test.
 2018-07-12 20:35:04 +02:00
Efraim Flashner
7060b28171
tests: hackage: Fix mock urls. 
Followup to 18f7473504.

* tests/hackage.scm (hackage->guix-package): Use 'https' in mock urls.
 2016-09-01 13:40:49 +03:00
Mathieu Lirzin
a9edb211e7 build: Add a Guile custom test driver using SRFI-64. 
Before that '.log' files for scheme tests were fragmented and not
included in test-suite.log.  This unifies the semantics of SRFI-64 API
with Automake test suite.

* build-aux/test-driver.scm: New file.
* Makefile.am (SCM_LOG_DRIVER, AM_SCM_LOG_DRIVER_FLAGS): New variables.
(SCM_LOG_COMPILER, AM_SCM_LOG_FLAGS): Delete variables.
(AM_TESTS_ENVIRONMENT): Set GUILE_AUTO_COMPILE to 0.
* test-env.in: Silence guix-daemon.
* doc/guix.texi (Running the Test Suite): Describe how to display the
detailed results.  Bug reports require only 'test-suite.log' file.
* tests/base32.scm, tests/build-utils.scm, tests/builders.scm,
tests/challenge.scm, tests/cpan.scm, tests/cpio.scm, tests/cran.scm,
tests/cve.scm, tests/derivations.scm, tests/elpa.scm,
tests/file-systems.scm, tests/gem.scm, tests/gexp.scm,
tests/gnu-maintenance.scm, tests/grafts.scm, tests/graph.scm,
tests/gremlin.scm, tests/hackage.scm, tests/hash.scm,
tests/import-utils.scm, tests/lint.scm, tests/monads.scm, tests/nar.scm,
tests/packages.scm, tests/pk-crypto.scm, tests/pki.scm,
tests/profiles.scm, tests/publish.scm, tests/pypi.scm,
tests/records.scm, tests/scripts-build.scm, tests/scripts.scm,
tests/services.scm, tests/sets.scm, tests/size.scm, tests/snix.scm,
tests/store.scm, tests/substitute.scm, tests/syscalls.scm,
tests/system.scm, tests/ui.scm, tests/union.scm, tests/upstream.scm,
tests/utils.scm: Don't exit at the end of test groups.
* tests/containers.scm: Likewise.  Use 'test-skip' instead of exiting
with error code 77.
 2016-04-03 14:19:09 +02:00
Federico Beffa
d3c827e419 import: hackage: Add new tests. 
* tests/hackage.scm (eval-test-with-cabal): Add optional argument.
  (test-cabal-3): New variable and test.
  (test-read-cabal-1): Exercise more parsing variants.
 2015-11-26 18:17:23 +01:00
Federico Beffa
a415474873 import: hackage: Refactor parsing code and add new options. 
* guix/import/cabal.scm: New file.
* guix/import/hackage.scm: Update to use the new Cabal parsing module.
* tests/hackage.scm: Update tests.
* guix/scripts/import/hackage.scm: Add new '--cabal-environment' and '--stdin'
  options.
* doc/guix.texi: ... and document them.
* Makefile.am (MODULES): Add 'guix/import/cabal.scm',
  'guix/import/hackage.scm' and 'guix/scripts/import/hackage.scm'.
  (SCM_TESTS): Add 'tests/hackage.scm'.
 2015-06-09 09:48:38 +02:00
Federico Beffa
b29455cfe7 import: Add hackage importer. 
* guix/import/hackage.scm: New file.
* tests/hackage.scm: New file.
 2015-04-08 17:31:11 +02:00