mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: gash, gash-utils: Build with Guile 3.0.
* gnu/packages/shells.scm (gash)[source]: Add 'modules' and 'snippet'. [inputs]: Change GUILE-2.2 to GUILE-3.0. (gash-utils)[source]: Add 'modules' and 'snippet'. [inputs]: Change GUILE-2.2 to GUILE-3.0. * gnu/packages/commencement.scm (gash-utils-boot)[source]: Remove unneeded 'modules' field, and add 'snippet'. (gash-utils-boot)[source]: New field. * gnu/packages/patches/gash-utils-ls-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
parent
2807a8432a
commit
af74c0633a
4 changed files with 51 additions and 5 deletions
25
gnu/packages/patches/gash-utils-ls-test.patch
Normal file
25
gnu/packages/patches/gash-utils-ls-test.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
'ls.scm' monkey-patches (ice-9 getopt-long) to allow it to recognize '-1'
|
||||
as a valid option. Unfortunately, monkey patching no longer works with
|
||||
Guile 3.0 due to inlining, so change the test to make do without '-1'.
|
||||
|
||||
diff --git a/tests/core-utils.org b/tests/core-utils.org
|
||||
index d35ede8..22718e3 100644
|
||||
--- a/tests/core-utils.org
|
||||
+++ b/tests/core-utils.org
|
||||
@@ -93,14 +93,11 @@
|
||||
* ls
|
||||
:script:
|
||||
#+begin_src sh
|
||||
- ls -1 tests/data/star
|
||||
+ ls tests/data/star
|
||||
#+end_src
|
||||
:stdout:
|
||||
#+begin_example
|
||||
- 0
|
||||
- 1
|
||||
- 2
|
||||
- 3
|
||||
+ 0 1 2 3
|
||||
#+end_example
|
||||
|
||||
* test-file
|
Loading…
Add table
Add a link
Reference in a new issue