1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 03:21:49 +02:00
Commit Graph

94 Commits

Author SHA1 Message Date
Nicolas Graves 01ad0cf43e gnu: ruby: Populating (gnu packages ruby-check/ruby-xyz).
* gnu/packages/ruby.scm: Move all packages except different versions
of ruby and mruby, to either (gnu packages ruby-check) or
(gnu packages ruby-xyz).

* gnu/packages/ruby-check.scm (bundler, ruby-builder, ruby-cucumber-ci-environment,
ruby-cucumber-compatibility-kit,
ruby-cucumber-compatibility-kit-bootstrap, ruby-cucumber-core,
ruby-cucumber-expressions, ruby-cucumber-gherkin,
ruby-cucumber-html-formatter, ruby-cucumber-messages,
ruby-cucumber-tag-expressions, ruby-cucumber-wire, ruby-diff-lcs,
ruby-docile, ruby-fivemat, ruby-given-core, ruby-hoe, ruby-hoe-3,
ruby-json, ruby-mime-types, ruby-mime-types-data, ruby-mini-portile,
ruby-mini-portile-2, ruby-minitest, ruby-minitest-bonus-assertions,
ruby-minitest-focus, ruby-minitest-hooks, ruby-minitest-moar,
ruby-multi-test, ruby-rake, ruby-rake-compiler,
ruby-rake-compiler-dock, ruby-rspec, ruby-rspec-2, ruby-rspec-core,
ruby-rspec-core-2, ruby-rspec-expectations, ruby-rspec-expectations-2,
ruby-rspec-mocks, ruby-rspec-mocks-2, ruby-rspec-support, ruby-sequel,
ruby-simplecov-json-formatter, ruby-simplecov, ruby-simplecov-html,
ruby-sorcerer, ruby-unindent): Moved from (gnu packages ruby).
 (ruby-asciidoctor/minimal): New variable, to allow more minimal
 import of only (gnu packages ruby-check) in a lot of modules.
 (ruby-rubocop/minimal): New variable to build cucumber with a lot
 less dependencies.
 (cucumber-ruby-core)[native-inputs]: Replace ruby-rubocop by
 ruby-rubocop/minimal. Remove ruby-coveralls.

* gnu/packages/ruby-xyz.scm: Move all other packages from
(gnu packages ruby).

* gnu/packages/admin.scm
* gnu/packages/bioinformatics.scm
* gnu/packages/databases.scm
* gnu/packages/emacs-xyz.scm
* gnu/packages/gnome-xyz.scm
* gnu/packages/gnome.scm
* gnu/packages/groff.scm
* gnu/packages/kde-systemtools.scm
* gnu/packages/libffi.scm
* gnu/packages/mail.scm
* gnu/packages/maths.scm
* gnu/packages/mpd.scm
* gnu/packages/ntp.scm
* gnu/packages/package-management.scm
* gnu/packages/plotutils.scm
* gnu/packages/protobuf.scm
* gnu/packages/rails.scm
* gnu/packages/ruby-check.scm
* gnu/packages/ruby-xyz.scm
* gnu/packages/ruby.scm
* gnu/packages/shellutils.scm
* gnu/packages/statistics.scm
* gnu/packages/tex.scm
* gnu/packages/virtualization.scm:
    Adapt module imports accordingly.

* gnu/packages/backup.scm (btrbk):
* gnu/packages/ccache.scm (ccache):
* gnu/packages/cluster.scm (drbd-utils):
* gnu/packages/compton.scm (picom):
* gnu/packages/cryptsetup.scm (cryptsetup):
* gnu/packages/engineering.scm (kicad-doc):
* gnu/packages/games.scm (warzone2100):
* gnu/packages/irc.scm (open-adventure):
* gnu/packages/ntp.scm (weechat):
* gnu/packages/password-utils.scm (keepassxc):
* gnu/packages/radio.scm (wsjtx, jtdx):
* gnu/packages/syndication.scm (newsboat):
* gnu/packages/task-management.scm (timewarrior):
* gnu/packages/version-control.scm (git-lfs):
    [native-inputs]: Replace ruby-asciidoctor by
    ruby-asciidoctor/minimal. Adapt module imports accordingly.

* gnu/packages/text-editors.scm: Remove (gnu packages ruby) import.

Signed-off-by: Andreas Enge <andreas@enge.fr>
2025-06-20 20:40:02 +02:00
Nicolas Graves a4915c37d9 gnu: ruby-protobuf: Update to 3.10.9.
* gnu/packages/protobuf.scm (ruby-protobuf): Update to 3.10.9.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
2025-06-20 20:39:54 +02:00
Morgan Smith e5b1ec68eb gnu: emacs-protobuf-mode: Use '#:lisp-directory'.
* gnu/packages/protobuf.scm (emacs-protobuf-mode): Use
'#:lisp-directory'.

Change-Id: If9b39106954fa66b64ef333def79989a61ac0e68
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2025-06-15 16:56:53 +02:00
Ricardo Wurmus b0faa68d52 gnu: python-protobuf: Update to 3.20.3.
* gnu/packages/protobuf.scm (python-protobuf): Update to 3.20.3.
[inputs]: Use protobuf-3.20.
[arguments]: Do not use C++ implementation.

Change-Id: I21d140ce2959b009026847b1ad73c15dfa23fd91
2025-04-16 11:46:12 +02:00
Ricardo Wurmus 0c7debdcd1 gnu: protobuf: Update to 3.20.3.
* gnu/packages/protobuf.scm (protobuf): Update to 3.20.3.

Change-Id: I451913a3f379f7bad1f6cea56fb6b028627984bb
2025-04-16 11:46:12 +02:00
Sharlatan Hellseher d9bbc3cabc gnu: python-protobuf-5: Update to 5.28.3.
* gnu/packages/protobuf.scm (python-protobuf-5): Update to 5.28.3.
[arguments]<phases>: Remove redundant custom 'check.
[native-inputs]: Add python-setuptools and python-wheel.

Change-Id: Icaa373287055ed4e170b5556f721018b910369c0
2024-12-13 20:28:39 +00:00
Lars-Dominik Braun fdc0fefd46 build-system/pyproject: Use python-sans-pip-wrapper as default-python.
Also adds python-setuptools and python-wheel to relevant packages,
either to native-inputs or to propagated inputs if the pkg_resources
Python module is loaded at runtime.

* guix/build-system/pyproject.scm (default-python): Default to
python-sans-pip-wrapper.

Change-Id: I2d986c2225114f54459dd6bb360913106e52cdf4
2024-12-13 20:15:41 +00:00
Morgan Smith 498b6cd008 gnu: Add python-protobuf-5.
* gnu/packages/protobuf.scm (python-protobuf-5): New variable.

Change-Id: Ic181a92bc0e3eb66adf535d98b192cbb006028ad
Signed-off-by: Luca Matei Pintilie <luca@lucamatei.com>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-11-25 11:40:54 +01:00
Zheng Junjie e3ab05320d gnu: protobuf-c: Fix cross-compilation.
* gnu/packages/protobuf.scm (protobuf-c): Fix cross-compilation.
[native-inputs]: When cross-compilation, add protobuf.
[arguments]<#:configure-flags>: When cross-compilation, Set PROTOC variable.

Change-Id: Idd660f526b7c90277cb4399997cdb7ce72e4f1c5
Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn>
2024-08-23 22:29:17 +08:00
Ricardo Wurmus 7720430678 gnu: python-protobuf: Update to 3.20.2.
* gnu/packages/protobuf.scm (python-protobuf): Update to 3.20.2.

Change-Id: Ic7a0f199f522ebf1e62e9179b4a7e4223594299c
2024-01-01 14:35:12 +01:00
Zheng Junjie a077907226 gnu: protobuf: Fix cross-compilation.
* gnu/packages/protobuf.scm (protobuf): Fix cross-compilation.
[native-inputs]: When cross-compiling, add this-package.
[inputs]: Add googletest.

Change-Id: Id7d3a8be9d4211249c0adc3a99a7a07206f9c495
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2023-11-25 14:47:51 +01:00
Christopher Baines e0a1fcb1d1 gnu: ruby-protobuf: Fix build.
* gnu/packages/protobuf.scm (ruby-protobuf)[arguments]: Update style.
[native-inputs]: Remove ruby-pry-byebug.
2023-07-10 08:25:59 +01:00
Ricardo Wurmus 484b843c2e gnu: Add protobuf-3.20.
* gnu/packages/protobuf.scm (protobuf-3.20): New variable.
2023-05-05 15:39:28 +02:00
Ricardo Wurmus 95d26d8530 gnu: python-protobuf-3.6: Patch for Python 3.10.
* gnu/packages/protobuf.scm (python-protobuf-3.6)[arguments]: Patch
collections import.
[native-inputs]: Add python-setuptools-for-tensorflow.
2023-04-21 13:10:33 +02:00
Maxim Cournoyer 3928e3d426 gnu: Remove python-typing-extensions-next.
* gnu/packages/python-xyz.scm (python-typing-extensions-next): Delete variable.
2023-04-19 20:12:13 -04:00
Maxim Cournoyer 9b0c794d2c gnu: ruby-protobuf: Update to 3.10.3.
* gnu/packages/protobuf.scm (ruby-protobuf): Update to 3.10.3.  Delete
trailing #t.
[arguments]: Use search-input-file in patch-protoc phase.  Honor #:tests? in
check phase.
2023-03-28 22:22:42 -04:00
Maxim Cournoyer 365de8cfd2 gnu: ruby-activesupport: Update to 7.0.4.3.
* gnu/packages/ruby.scm (ruby-activesupport): Move to...
* gnu/packages/rails.scm (ruby-activesupport): ... here.
(%ruby-rails-version, ruby-rails-monorepo): New variables.
(ruby-activesupport): Update to 7.0.4.3.
[arguments]: Use gexps.  Add the delete-gemfiles, chdir, check-setup and
delete-problematic-tests phases.  Delete check phase override.
[native-inputs]: New field.
[propagated-inputs]: Remove ruby-zeitwerk.  Replace ruby-minitest with
ruby-minitest-5.15.
[home-page]: Update URL.
2023-03-28 22:22:17 -04:00
Maxim Cournoyer a133212daf gnu: Remove ruby-protobuf-cucumber.
The package is no longer used by ruby-cucumber-messages, its sole user.  It is
unmaintained.

* gnu/packages/protobuf.scm (ruby-protobuf-cucumber): Delete variable.
2023-03-28 22:22:14 -04:00
Ludovic Courtès bf46192d4c gnu: python-protobuf@3.6: Fix inputs and arguments.
Fixes a regression introduced in
9b016e2991, whereby the 'inputs' field
would be invalid, plus "--cpp_implementation" wouldn't work.

* gnu/packages/protobuf.scm (python-protobuf-3.6)[arguments]: New
field.
[inputs]: No longer refer to the inputs of PYTHON-PROTOBUF.
2022-12-04 00:36:22 +01:00
Ontje Lünsdorf 9b016e2991 gnu: python-protobuf: Use C++ implementation.
* gnu/packages/protobuf.scm (python-protobuf): Use C++ implementation.
  [inputs]: Add protobuf.
  [arguments]: Add --cpp_implementation configure flags.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-12-02 23:11:09 +01:00
Marius Bakke 4bf4e051d1 gnu: protobuf@3.5: Inherit from protobuf@3.6.
* gnu/packages/protobuf.scm (protobuf-3.5): Change inheritance, so it gets the
correct build system and phases.
2022-11-22 08:37:23 +01:00
Marius Bakke 3a91ee3b88 gnu: protobuf@2: Fix build.
* gnu/packages/protobuf.scm (protobuf-2)[build-system]: Set to GNU-BUILD-SYSTEM.
[arguments]: Clear.
[outputs]: Remove "static".
2022-11-20 15:15:33 +01:00
Christopher Baines f73d9690ad gnu: protobuf-2: Use gexp in arguments.
This fixes the breakage introduced when the protobuf package switched to using
gexp's in the arguments.

The package doesn't build, but at least the builder is now deterministic and
valid Guile.

* gnu/packages/protobuf.scm (protobuf-2)[arguments]: Adapt to use gexp's.
2022-11-14 08:59:23 +00:00
Ricardo Wurmus ac07544ebf gnu: Add protobuf-c-for-aiscm.
* gnu/packages/protobuf.scm (protobuf-c-for-aiscm): New variable.
2022-11-11 17:19:10 +01:00
Maxim Cournoyer 9e417d5cf6 gnu: protobuf-c: Update to 1.4.1.
* gnu/packages/protobuf.scm (protobuf-c): Update to 1.4.1.
2022-11-06 00:08:04 -04:00
Maxim Cournoyer 32ba6c5ddf gnu: protobuf: Unbundle googletest.
* gnu/packages/protobuf.scm (protobuf) [origin]: Delete third_party directory
in snippet.
[configure-flags]: Add "-Dprotobuf_USE_EXTERNAL_GTEST=ON".
[native-inputs]: Add googletest.
2022-11-06 00:08:04 -04:00
Maxim Cournoyer 9f6479ecad gnu: protobuf: Update to 3.21.9.
* gnu/packages/protobuf.scm (protobuf): Update to 3.21.9.  Move outputs field before
build system.  Move inputs field below arguments.
[source]: Apply patch and update URL.
[build-system]: Use cmake-build-system.  This causes the CMake support files
to be installed, which is expected by some packages such as hyperledger-iroha.
[arguments]: Use gexps.
[configure-flags]: Add BUILD_SHARED_LIBS=ON.
[phases]: Add set-c++-standard.
[home-page]: Update URL.
(protobuf-3.6): Adjust to continue using the gnu-build-system.
* gnu/packages/patches/protobuf-fix-build-on-32bit.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
2022-11-06 00:08:03 -04:00
Marius Bakke 8bdc4c1547 gnu: python-mypy-protobuf: Switch to pyproject-build-system.
* gnu/packages/protobuf.scm (python-mypy-protobuf)[build-system]: Switch to
PYPROJECT-BUILD-SYSTEM.
[arguments]: Remove redundant phases.
[native-inputs]: Remove PYTHON-PYPA-BUILD.
2022-10-27 19:43:07 +02:00
Maxim Cournoyer 1a7fb20e8c gnu: Add python-mypy-protobuf.
* gnu/packages/protobuf.scm (python-mypy-protobuf): New variable.
2022-08-31 23:13:46 -04:00
Maxim Cournoyer 5eb1686537 gnu: Add python-nanopb.
* gnu/packages/protobuf.scm (python-nanopb): New variable.
2022-08-31 10:33:42 -04:00
Maxim Cournoyer cc3cc72d85 gnu: Add nanopb.
* gnu/packages/protobuf.scm (nanopb): New variable.
2022-08-31 09:23:39 -04:00
Tobias Geerinckx-Rice 069d6a3f64 gnu: fstrm: Refer to HPND licence by name.
* gnu/packages/protobuf.scm (fstrm)[license]: Use license:hpnd directly.
2022-07-24 02:00:11 +02:00
Tobias Geerinckx-Rice 59d7976782 gnu: fstrm: Omit static library.
* gnu/packages/protobuf.scm (fstrm)[arguments]:
Add "--disable-static" to #:configure-flags.
2022-07-24 02:00:00 +02:00
Tobias Geerinckx-Rice b167c54e51 gnu: fstrm: Update to 0.6.1.
* gnu/packages/protobuf.scm (fstrm): Update to 0.6.1.
[license]: Update too.
2022-07-24 02:00:00 +02:00
Maxim Cournoyer 07fdfb9e1e gnu: protobuf-2: Fix build.
Partially fixes <https://issues.guix.gnu.org/51093>.

* gnu/packages/protobuf.scm (protobuf-2)
[phases]{disable-broken-tests}: Delete phase.
2022-07-12 11:18:13 -04:00
Maxim Cournoyer cf03e0d290 gnu: Remove python2-protobuf.
* gnu/packages/protobuf.scm (python2-protobuf): Delete variable.
2022-05-31 14:53:04 -04:00
Christopher Baines 57be6ba0f3 gnu: python-protobuf-3.6: Add missing input.
This was removed from python-protobuf in
5f8491ea95.

* gnu/packages/protobuf.scm (python-protobuf-3.6)[inputs]: Add python-six.
2022-05-27 13:57:20 +01:00
Ricardo Wurmus f8a6ae18a6 gnu: Add python-proto-plus.
* gnu/packages/protobuf.scm (python-proto-plus): New variable.
2022-05-20 13:29:15 +02:00
Ricardo Wurmus 5f8491ea95 gnu: python-protobuf: Update to 3.20.1.
* gnu/packages/protobuf.scm (python-protobuf): Update to 3.20.1.
[native-inputs]: Remove python-wheel.
[propagated-inputs]: Remove python-six.
2022-05-20 10:06:36 +02:00
Tobias Geerinckx-Rice a3500a0a65 gnu: protozero: Update to 1.7.1.
* gnu/packages/protobuf.scm (protozero): Update to 1.7.1.
2022-01-16 01:00:01 +01:00
Ludovic Courtès 8394619bac gnu: Simplify package inputs.
This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
2021-12-13 17:48:25 +01:00
Efraim Flashner 1c94392a13 Merge remote-tracking branch 'origin/master' into core-updates-frozen 2021-11-08 09:06:14 +02:00
Felix Gruber 53bbbfb77c gnu: protozero: Update to 1.7.0.
* gnu/packages/protobuf.scm (protozero): Update to 1.7.0.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-11-07 09:59:59 +01:00
Ludovic Courtès 0e47fcced4 Merge branch 'master' into core-updates 2021-07-18 19:50:01 +02:00
Maxim Cournoyer 0ce685c65f gnu: protobuf: Update to 3.17.3.
* gnu/packages/protobuf.scm (protobuf): Update to 3.17.3.
[phases]{disable-broken-tests}: New phase.
{move-static-libraries}: Remove trailing #t.
2021-07-02 16:50:08 -04:00
Tobias Geerinckx-Rice 9dea3f101f Merge branch 'master' into core-updates
Conflicts:
	gnu/packages/cups.scm
	gnu/packages/python-web.scm
	gnu/packages/web.scm
	guix/build/maven/pom.scm
2021-06-23 18:45:21 +02:00
Carlo Zancanaro 6b83da9616 gnu: Fix references to emacs-build-system's expand-load-path phase.
* gnu/packages/emacs-xyz.scm (emacs-pdf-tools)[#:phases]: Use
emacs-expand-load-path instead of emacs-add-source-to-load-path.
* gnu/packages/erlang.scm (emacs-erlang)[#:phases]: Use expand-load-path
instead of add-source-to-load-path.
* gnu/packages/protobuf.scm (emacs-protobuf-mode)[#:phases]: Use
expand-load-path instead of add-source-to-load-path.

Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
2021-06-23 09:08:41 +02:00
Marius Bakke 8d59c262ad Merge branch 'master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
2021-06-06 21:16:32 +02:00
Marius Bakke dbcf2b61b1 gnu: Fix erroneous uses of 'package/inherit'.
These packages use a different source/version from the inherited package, and
thus should not inherit replacements.

* gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record
inheritance instead of PACKAGE/INHERIT.
* gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4,
rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23,
rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1,
rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3,
rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17,
rust-webpki-roots-0.14): Likewise.
* gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise.
* gnu/packages/guile.scm (guile-2.2.4): Likewise.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise.
* gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6):
Likewise.
* gnu/packages/python-web.scm (python2-html2text): Likewise.
* gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy,
python2-urwid, python2-markdown, python2-fonttools): Likewise.
* gnu/packages/racket.scm (racket): Likewise.
* gnu/packages/sequoia.scm (sequoia4pEp): Likewise.
2021-05-23 17:49:56 +02:00
Christopher Baines a8448da0f4 Merge branch 'master' into core-updates 2021-03-06 00:18:30 +00:00