nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,323 Commits 1 Branch 0 Tags 104 MiB
Commit Graph

12 Commits

Author SHA1 Message Date
David Craven f1d136957d
build-system: cargo: Handle Cargo.lock file not present. 
* guix/build-system/cargo.scm (cargo-build): Add src output.
  (private-keywords): Add #:outputs.
* guix/build/cargo-build-system.scm (configure): Use /share/rust-source
  when replacing inputs.
  (build, check): Don't do anything when there isn't a Cargo.lock file
  present.
  (install): Install sources to src output. When a Cargo.lock file is
  present use cargo install to install binaries to out.
* guix/import/crate.scm (make-crate-sexp): Importer uses the src output
  for crate inputs by default.
* guix/import/utils.scm (package-names->package-inputs, maybe-inputs,
  maybe-native-inputs): Take an optional output argument.
* tests/crate.scm (crate->guix-package test): Update.

Problem reported by Francisco Gómez García <espectalll@kydara.com>.
 2017-01-01 18:20:52 +01:00
David Craven bb3f36ed4c
import: utils: Add some utilities. 
* guix/import/utils.scm (maybe-inputs, maybe-native-inputs,
  package->definition): New variables.
 2016-12-14 16:30:42 +01:00
Alex Kost b37e1e6428
import: utils: Remove dependency on (json) module. 
This fixes a regression introduced by commit
fbe9c10128.

* guix/import/utils.scm: Remove unused (json) module.
 2016-10-16 19:19:31 +03:00
David Craven 11e296ef30
import: utils: Refactor license->symbol. 
* guix/import/utils.scm (license->symbol): Work for all licenses.
* tests/import-utils.scm (license->symbol): Add test.
 2016-09-28 13:17:15 +02:00
David Craven 59b2034787
import: utils: Add spdx-string->license. 
* guix/import/utils.scm (spdx-string->license): New variable.
* guix/licenses.scm (agpl1, fdl1.2+): New variables.
 2016-09-28 13:15:31 +02:00
David Craven 263ac57fc2
import: Move string->license to importers. 
* guix/import/gem.scm (string->license): Move from (guix import utils).
* guix/import/pypi.scm (string->license): Move from (guix import utils).
 2016-09-28 12:47:29 +02:00
David Craven fbe9c10128
import: Reorder imports in (guix import utils). 
* guix/import/utils.scm (define-module): Reorder imports alphabetically.
 2016-09-28 12:47:10 +02:00
David Craven a34b236c17
import: Importers return prefixed licenses. 
* guix/import/utils.scm
(define-module): Import licenses with license: prefix.
(string->licenses): Use prefixed licenses.
(license->symbol): Return symbols with the prefix license:.
* guix/tests/pypi.scm (pypi->guix-package): Update test cases.
* guix/tests/gem.scm (gem->guix-package): Update test case.
 2016-08-28 14:04:50 +02:00
Ben Woodcroft 2028a2c960 import: cran: Move beautify-description to utils module. 
* guix/import/cran.scm (beautify-description): Move from here...
* guix/import/utils.scm: ... to here.
 2016-01-14 19:44:36 +10:00
David Thompson 140b304815 import: pypi: Move generally useful procedures to utils module. 
* guix/import/pypi.scm (make-pypi-sexp): Factorize license to symbol
  conversion code.
  (string->license, snake-case, guix-hash-url): Move from here...
* guix/import/utils.scm: ... to here.
  (license->symbol): New procedure.
 2015-08-27 18:02:35 -04:00
Eric Bavier 1ff2619bc1 import: Factorize utility functions. 
* guix/import/pypi.scm (hash-table->alist, flatten, assoc-ref*,
  url-fetch, json-fetch): Pull procedures from here into...
* guix/import/utils.scm: Here and...
* guix/import/json.scm: Here.  New file.
* Makefile.am (MODULE)[HAVE_GUILE_JSON]: Add it.
* guix/import/gnu.scm (file-sha256): Move from here to...
* guix/hash.scm: Here.
* tests/pypi.scm (pypi->guix-package): Update mock module reference.
 2015-01-09 10:33:24 -06:00
David Thompson 1b3e968512 import: Add PyPI importer. 
* guix/snix.scm: Delete.
* guix/import/snix.scm: New file.
* guix/import/pypi.scm: New file.
* guix/import/utils.scm: New file.
* guix/scripts/import/nix.scm: New file.
* guix/scripts/import/pypi.scm: New file.
* tests/pypi.scm: New file.
* tests/snix.scm: Import (guix import snix) module.
* guix/scripts/import.scm (%default-options, %options): Delete.
  (%standard-import-options, importers): New variables.
  (show-help): List importers.
  (guix-import): Factor out Nix-specific logic.  Delegate to correct importer
  based upon first argument.
* configure.ac (HAVE_GUILE_JSON): New conditional.
* Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'.
  (SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
 2014-09-29 19:30:28 -04:00