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/cdrom.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/cdrom.scm')
| -rw-r--r-- | gnu/packages/cdrom.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 6391bd6fec..b544f0e59d 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -161,7 +161,7 @@ libcdio.") (define-public xorriso (package (name "xorriso") - (version "1.5.2") + (version "1.5.4") (outputs '("out" "gui")) (source (origin (method url-fetch) @@ -169,7 +169,7 @@ libcdio.") version ".tar.gz")) (sha256 (base32 - "1rqpzj95f70jfwpn4lamasfgqpizjsipz12aprdhri777b4zas9v")))) + "14p3r6jahfqqw2gf739l5myz5x4qb8h34zyczbpdps2krbq5bh9s")))) (build-system gnu-build-system) (arguments `(#:phases @@ -515,7 +515,7 @@ capacity is user-selectable.") #t))) #:tests? #f)) ; No tests. (inputs ; TODO package bundled wxvillalib - `(("wxwidgets" ,wxwidgets-3.1) + `(("wxwidgets" ,wxwidgets) ("wssvg" ,wxsvg) ("dbus" ,dbus) ("cdrtools" ,cdrtools) |