Commit graph

84 commits

Author SHA1 Message Date
Oleg Pykhalov
5a88d3dfcb
gnu: Add bats.
* gnu/packages/bash.scm (bats): New variable.
2020-06-29 10:39:38 +03:00
Ludovic Courtès
50ea3135e0
gnu: bash: Do not autoload (gcrypt hash).
Fixes <https://bugs.gnu.org/41457>.
Reported by Matias Jose Seco Baccanelli <matias_jose_seco@autoproduzioni.net>.

* gnu/packages/bash.scm: Avoid #:autoload for (gcrypt hash).  On Guile 2.2,
autoloading would bring it not only the 'port-sha256' binding (as on
3.0) but also the 'sha256' binding.  As a result, use of 'sha256' in the
'origin' form wouldn't match.
2020-05-22 18:49:50 +02:00
Ludovic Courtès
ce0be5675b
packages: Introduce <content-hash> and use it in <origin>.
* guix/packages.scm (<content-hash>): New record type.
(define-content-hash-constructor, build-content-hash)
(content-hash): New macros.
(print-content-hash): New procedure.
(<origin>): Rename constructor to '%origin'.
[sha256]: Remove field.
[hash]: New field.  Adjust users.
(origin-compatibility-helper, origin): New macros.
(origin-sha256): New deprecated procedure.
(origin->derivation): Adjust accordingly.
* tests/packages.scm ("package-source-derivation, origin, sha512"): New
test.
* guix/tests.scm: Hide (gcrypt hash) 'sha256' for proper syntax
matching.
* tests/challenge.scm: Add #:prefix for (gcrypt hash) and adjust users.
* tests/derivations.scm: Likewise.
* tests/store.scm: Likewise.
* tests/graph.scm ("bag DAG, including origins"): Provide 'sha256' field
with the right length.
* gnu/packages/aspell.scm (aspell-dictionary)
(aspell-dict-ca, aspell-dict-it): Use 'hash' and 'content-hash' for
proper syntax matching.
* gnu/packages/bash.scm (bash-patch): Rename 'sha256' to 'sha256-bv'.
* gnu/packages/bootstrap.scm (bootstrap-executable): Rename 'sha256' to 'bv'.
* gnu/packages/readline.scm (readline-patch): Likewise.
* gnu/packages/virtualization.scm (qemu-patch): Rename 'sha256' to
'sha256-bv'.
* guix/import/utils.scm: Hide (gcrypt hash) 'sha256'.
2020-05-22 01:29:39 +02:00
Marius Bakke
961d2ee269
Merge branch 'master' into core-updates 2020-03-14 13:13:40 +01:00
Tobias Geerinckx-Rice
a8a8a3df30
gnu: bash-tap: Use HTTPS home page.
* gnu/packages/bash.scm (bash-tap)[home-page]: Use HTTPS.
2020-03-10 22:23:11 +01:00
Marius Bakke
acb9277480
gnu: bash: Update to 5.0.16.
* gnu/packages/bash.scm (%patch-series-5.0): Add patches 12 through 16.
2020-02-15 22:02:57 +01:00
Mathieu Othacehe
ce9383c090
Merge remote-tracking branch 'master' into core-updates. 2019-12-31 11:04:51 +01:00
Ludovic Courtès
f94f9d67e6
gnupg: 'gnupg-verify*' returns a status symbol.
This allows callers to distinguish between signature verification
failure and missing key.

* guix/gnupg.scm (gnupg-receive-keys): Return true on success.
(gnupg-verify*): Check return value of 'gnupg-receive-keys'.  Return two
values, the first one being a symbol.
* guix/upstream.scm (download-tarball): Get the two return values of
'gnupg-verify*', and match on the first one.
* gnu/packages/bash.scm (download-patches): Check the first return value
of 'gnupg-verify*'.
2019-12-20 22:06:05 +01:00
Efraim Flashner
3f0f0d61bb
gnu: bash: Update to patch level 11.
* gnu/packages/bash.scm (%patch-series-5.0): Add patches 8 through 11.
2019-11-27 15:13:17 +02:00
Mathieu Othacehe
154d97abdd
Merge remote-tracking branch master into core-updates 2019-11-16 09:34:27 +01:00
Tobias Geerinckx-Rice
38e10e08b3
gnu: bash-tap: Don't use unstable tarball.
* gnu/packages/bash.scm (bash-tap)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
2019-11-03 06:38:55 +01:00
Mark H Weaver
567cca260d
gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems.
* gnu/packages/patches/bash-linux-pgrp-pipe.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/bash.scm (bash)[source]: Add the patch.
2019-09-23 23:46:48 +02:00
Ludovic Courtès
5cc1075a76
Merge branch 'master' into core-updates 2019-06-27 23:33:48 +02:00
Mathieu Othacehe
d8dbfbce60
gnu: bash-completion: Fix cross-compilation.
* gnu/packages/bash.scm (bash-completion)[arguments]: Search for util-linux in
native-inputs and inputs during "remove-redundant-completions" phase.
2019-06-25 21:34:36 +02:00
Efraim Flashner
13f3893b60
gnu: bash: Update to patch level 7.
* gnu/packages/bash.scm (%patch-series-5.0): Add patches 3 through 7.
2019-05-26 21:18:48 +03:00
Efraim Flashner
4aeb42b9f8
gnu: bash: Update to patch level 2.
* gnu/packages/bash.scm (%patch-series-5.0): Add patches 1 and 2.
[source]: Apply patches.
[version]: Update with patch numbers.
2019-03-02 22:21:27 +02:00
Efraim Flashner
847ffe8852
gnu: bash: Update to 5.0.
* gnu/packages/bash.scm (bash): Update to 5.0.
[source]: Remove patches.
(patch-url seqno): Prepare for bash-5.0 patches.
(%patch-series-4.4): Rename %patch-series-5.0, remove patches.
2019-01-08 18:19:24 +02:00
Marius Bakke
0aeb134850
Merge branch 'master' into core-updates 2018-09-09 17:40:35 +02:00
Ludovic Courtès
ca71942445
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)

* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt.  Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this.  Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this.  Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
 #:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions  Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules.  Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-09-04 17:25:11 +02:00
Efraim Flashner
1aa5c246e9
gnu: bash: Update to patch level 23.
* gnu/packages/bash.scm (%patch-series-4.4): Add patches 20 through 23.
2018-07-03 10:43:09 +03:00
Mark H Weaver
647888845c
Merge branch 'master' into core-updates 2018-03-20 00:49:05 -04:00
Tobias Geerinckx-Rice
504be7db58
gnu: bash-completion: Update to 2.8.
* gnu/packages/bash.scm (bash-completion): Update to 2.8.
* gnu/packages/patches/bash-completion-directories.patch: Update context.
2018-03-19 14:44:13 +01:00
Mark H Weaver
8809a15389
gnu: bash: Return #t from 'install-sh-symlink' phase.
* gnu/packages/bash.scm (bash)[arguments]: Return #t from
'install-sh-symlink' phase.
2018-03-16 10:19:22 -04:00
Roel Janssen
1382bde93c
gnu: bash: Don't specify default configuration filenames.
* gnu/packages/bash.scm (bash): Remove SYS_BASHRC and SYS_BASH_LOGOUT.
2018-03-04 15:21:30 +01:00
Marius Bakke
9102ce124c
gnu: bash: Update to patch level 19.
* gnu/packages/bash.scm (%patch-series-4.4): Add patches 13 through 19.
2018-02-20 19:54:25 +01:00
Leo Famulari
e081e2dd0b
Merge branch 'master' into core-updates 2017-07-23 19:06:49 -04:00
Efraim Flashner
8f155e3cff
gnu: bash-completion: Update to 2.7.
* gnu/packages/bash.scm (bash-completion): Update to 2.7.
2017-07-23 11:05:54 +03:00
Leo Famulari
c8eb2b8c60
Merge branch 'master' into core-updates 2017-07-10 14:37:53 -04:00
Tobias Geerinckx-Rice
ab3cac3785
gnu: bash-completion: Update to 2.6.
* gnu/packages/bash.scm (bash-completion): Update to 2.6.
2017-07-06 01:28:05 +02:00
Ludovic Courtès
4cc80c946b
gnu: bash-minimal: Simplify 'arguments' field.
* gnu/packages/bash.scm (bash-minimal)[arguments]: Remove 'let' and use
'substitute-keyword-arguments' directly.
2017-06-02 17:22:06 +02:00
Sergei Trofimovich
a30188f561
gnu: bash-minimal: Override keywords from 'bash'.
'bash-minimal' is a package derived from 'bash' package.  'bash-minimal'
is supposed to override keywords from 'bash', but does not do it due to
ordering issue.

This patch moves #:modules last.

Fixes the bootstrap failure reported by rennes and Manolis Ragkousis and
tracked down by Andy Wingo in
<https://lists.gnu.org/archive/html/guix-devel/2017-05/msg00010.html>.

* gnu/packages/bash.scm (bash-minimal)[arguments]: Move #:modules
after (package-arguments bash).

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-05-30 21:20:19 +02:00
Marius Bakke
84157bb8bf
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8.
2017-03-30 22:59:53 +02:00
Tobias Geerinckx-Rice
6fd52309b8
gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.
All HTTP gnu.org (and supported subdomain) HOME-PAGEs changed to HTTPS.
2017-03-30 01:30:16 +02:00
Ludovic Courtès
e90e0fad1b
Merge branch 'master' into core-updates 2017-03-09 16:35:41 +01:00
Ludovic Courtès
6c5b56f9fa
gnu: bash: Use the bootstrap Guile in 'url-fetch/reset-patch-level'.
Fixes <http://bugs.gnu.org/25775>.
Reported by Sirgazil, Ricardo Wurmus, Andy Wingo, and others.

* guix/download.scm (in-band-download): Always use GUILE.  This reverts
9f05908fb1.
* gnu/packages/bash.scm (url-fetch/reset-patch-level): Remove #:guile.
Pass %BOOTSTRAP-GUILE as #:guile to 'url-fetch'.  Remove #:guile-for-build
argument in 'gexp->derivation' call.
2017-03-07 23:58:08 +01:00
Marius Bakke
c762d09e89
gnu: bash-completion: Update to 2.5.
* gnu/packages/bash.scm (bash-completion): Update to 2.5.
2017-02-22 08:13:05 +01:00
Efraim Flashner
def9716890
gnu: bash: Update to patch level 12.
* gnu/packages/bash.scm (%patch-series-4.4): Add patch 12.
2017-02-20 12:35:12 +02:00
Ludovic Courtès
20c1b4b88d
gnu: bash: Remove graft for CVE-2017-5932.
* gnu/packages/bash.scm (bash)[replacement]: Remove.
(bash-minimal)[replacement]: Remove.
(url-fetch/reset-patch-level, bash/fixed): Remove.
2017-02-10 17:44:31 +01:00
Ludovic Courtès
768f0ac9dd
Merge branch 'master' into core-updates 2017-02-10 17:40:25 +01:00
Ludovic Courtès
50b8a527ef
gnu: bash: Add graft for patch #7 [fixes CVE-2017-5932].
* gnu/packages/bash.scm (bash)[replacement]: New field.
(bash-minimal): Likewise.
(url-fetch/reset-patch-level): New procedure.
(bash/fixed): New variable.
2017-02-10 16:44:57 +01:00
Ludovic Courtès
afd5323378
gnu: bash: Update patch URL to 4.4.
* gnu/packages/bash.scm (patch-url): Change "43" to "44".
2017-02-10 16:44:54 +01:00
Carlos Sánchez de La Lama
17c732295a
gnu: bash-minimal: Assume getcwd works correctly when cross-compiling
* gnu/packages/bash.scm (bash-minimal): Assume getcwd works correctly
when cross compiling.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2017-02-09 16:58:51 +02:00
Carlos Sánchez de La Lama
c8916c3336
gnu: bash-minimal: Assume getcwd works correctly when cross-compiling
* gnu/packages/bash.scm (bash-minimal): Assume getcwd works correctly
when cross compiling.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2017-02-09 13:05:17 +02:00
Ludovic Courtès
d9b4cbc2a1
gnu: bash: Do not retain dependency on Coreutils.
Previously the "include" output of BASH-FINAL would refer to
'bootstrap-binaries' via 'Makefile.inc'.

* gnu/packages/bash.scm (bash)[arguments]: In 'move-development-files'
phase, remove absolute file name of 'install' from the 'INSTALL'
variable in 'Makefile.inc'.
* gnu/packages/commencement.scm (bash-final)[arguments]: Pass
 #:disallowed-references.
2017-01-27 09:52:26 +01:00
Leo Famulari
b848f98e04
gnu: bash: Update to patch level 11.
* gnu/packages/bash.scm (%patch-series-4.4): Add patches 6 through 11.
2017-01-21 21:36:16 -05:00
Efraim Flashner
feefbb0946
gnu: bash: Update to patch level 5.
* gnu/packages/bash.scm (%patch-url-seqno): Update for bash-4.4.
(%patch-series-4.4): Add patches 1 to 5.
2016-11-27 09:24:40 +02:00
Ludovic Courtès
c86447f486
gnu: bash-minimal: Remove "include" output.
* gnu/packages/bash.scm (bash-minimal)[outputs]: New field.
(static-bash)[outputs]: Remove.
2016-10-13 16:26:49 +02:00
Mark H Weaver
abcf4858cd
Merge branch 'master' into core-updates 2016-10-12 09:28:14 -04:00
Efraim Flashner
b07e086373
gnu: bash-completion: Update to 2.4.
* gnu/packages/bash.scm (bash-completion): Update to 2.4.
[home-page]: Update to redirected home-page.
2016-10-10 11:58:11 +03:00
Ludovic Courtès
e543c8a2c6
gnu: bash-minimal: Remove 'move-development-files' phase.
* gnu/packages/bash.scm (bash-minimal)[arguments]: Delete
'move-development-files' phase.
(static-bash)[arguments]: Remove deletion of 'move-development-files'
phase.
2016-10-02 15:16:21 +02:00