diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/axoloti.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/axoloti.scm')
| -rw-r--r-- | gnu/packages/axoloti.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 622c4f94cb..e0dd22c627 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -33,11 +33,11 @@ #:use-module (gnu packages flashing-tools) #:use-module (gnu packages java) #:use-module (gnu packages java-graphics) + #:use-module (gnu packages java-xml) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) #:use-module (gnu packages textutils) - #:use-module (gnu packages version-control) - #:use-module (gnu packages xml)) + #:use-module (gnu packages version-control)) ;; XXX The patch does not apply to libusb 1.0.24. ;; See https://github.com/axoloti/axoloti/issues/464 @@ -98,8 +98,6 @@ (srfi srfi-26) (ice-9 match) (ice-9 regex)) - #:imported-modules ((guix build syscalls) - ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths @@ -232,7 +230,6 @@ runtime.") (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - (guix build syscalls) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -390,7 +387,6 @@ patcher application."))) (sxml xpath) (sxml transform)) #:imported-modules ((guix build ant-build-system) - (guix build syscalls) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases |