ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
141436 commits 1 branch 0 tags 448 MiB
Commit graph

60 commits

Author SHA1 Message Date
Efraim Flashner
45c6abaef5
gnu: inkscape: Skip some tests on riscv64-linux. 
* gnu/packages/inkscape.scm (inkscape)[arguments]: Use the custom
'disable-more-tests phase on riscv64-linux also.
 2023-05-02 14:32:03 +03:00
Efraim Flashner
1ab846181f
gnu: inkscape: Skip more tests on some architectures. 
* gnu/packages/inkscape.scm (inkscape)[arguments]: Add a phase when
building for aarch64-linux or powerpc64le-linux to skip some more tests.
 2023-05-01 00:30:21 +03:00
Efraim Flashner
ae5d352534
gnu: inkscape: Fixup inputs. 
* gnu/packages/inkscape.scm (inkscape/stable)[inputs]: Replace librsvg
with librsvg-for-system.
(inkscape)[inputs]: Remove duplicate bash-minimal, librsvg.
 2023-04-10 16:59:49 +03:00
Efraim Flashner
4cf1acc7f3
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
 2023-01-30 12:39:40 +02:00
Michael Rohleder
25b01ed77f
gnu: inkscape: Fix qrcode rendering. 
Fixes <https://issues.guix.gnu.org/57479>.

* gnu/packages/inkscape.scm (inkscape)[inputs]: Add python-cssselect.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2023-01-27 18:16:55 +01:00
Marius Bakke
135ad8988a
gnu: inkscape: Fix build with Poppler 22.9.0. 
This fixes a regression introduced in c37a31e9ab.

* gnu/packages/patches/inkscape-poppler-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/inkscape.scm (inkscape/stable)[source](patches): New field.
 2022-09-09 17:03:55 +02:00
Marius Bakke
2bc88940e8
gnu: lib2geom: Remove 1.1. 
* gnu/packages/graphics.scm (lib2geom): Update to 1.2.
(lib2geom-1.2): Remove variable.
* gnu/packages/inkscape.scm (inkscape/stable)[inputs]: Change from
LIB2GEOM-1.2 to LIB2GEOM.
 2022-08-12 00:22:28 +02:00
Marius Bakke
5ccf3dfd55
gnu: inkscape: Remove input labels. 
* gnu/packages/inkscape.scm (inkscape/stable)[inputs]: Remove labels.
 2022-08-12 00:22:28 +02:00
Marius Bakke
aaff183093
gnu: inkscape: Remove obsolete input. 
* gnu/packages/inkscape.scm (inkscape/stable)[native-inputs]: Remove
INTLTOOL.  Add GETTEXT-MINIMAL.
 2022-08-12 00:22:28 +02:00
Marius Bakke
da51ffafc7
gnu: inkscape/stable: Update to 1.2.1. 
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
[arguments, inputs]: Take the changes from ...
(inkscape): ... this variable, and adjust this one accordingly.
 2022-08-12 00:22:28 +02:00
Marius Bakke
12c9e59600
gnu: inkscape: Disable failing tests. 
* gnu/packages/inkscape.scm (inkscape/stable)[arguments]: Add phase.
 2022-08-12 00:22:28 +02:00
Marius Bakke
1892f5539e
gnu: inkscape: Build with lib2geom 1.2. 
* gnu/packages/graphics.scm (lib2geom-1.2): New variable.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Enable previously failing
test.
[inputs]: Replace "lib2geom" with LIB2GEOM-1.2.
 2022-08-04 12:30:13 +02:00
Marius Bakke
20d1e2ffb0
gnu: inkscape: Update to 1.2.1. 
* gnu/packages/inkscape.scm (inkscape): Update to 1.2.1.
 2022-08-04 12:30:12 +02:00
Maxim Cournoyer
ad7a2be415
gnu: inkscape: Add bash-minimal to inputs. 
* gnu/packages/inkscape.scm (inkscape)[inputs]: Add bash-minimal.
 2022-07-12 23:23:26 -04:00
Maxim Cournoyer
b1523ffac5
gnu: inkscape: Wrap GDK_PIXBUF_MODULE_FILE. 
Fixes <https://issues.guix.gnu.org/55634>.

* gnu/packages/inkscape.scm (inkscape)
[phases]{wrap-program}: Override phase.

Reported-by: Maxime Devos <maximedevos@telenet.be>
 2022-07-12 23:23:26 -04:00
Maxim Cournoyer
7dcba233a3
gnu: inkscape: Reintroduce variable, updated to 1.2. 
* gnu/packages/inkscape.scm (inkscape): Update to 1.2.
[phases]{disable-problematic-tests}: New phase.
 2022-07-12 23:23:26 -04:00
Maxim Cournoyer
023259c4bd
gnu: inkscape: Rename variable to inkscape/stable and hide package. 
This will allow introducing a new 'inkscape' package that can be more freely
upgraded on the main branch.

* gnu/packages/inkscape.scm (inkscape): Rename to...
(inkscape/stable): ... this, and make it a hidden package.
* gnu/packages/admin.scm (wpa-supplicant-gui)[native-inputs]: Rename inkscape
input accordingly.
* gnu/packages/docbook.scm (dblatex): Likewise.
* gnu/packages/gnome-xyz.scm (arc-theme): Likewise.
* gnu/packages/python-xyz.scm (python-matplotlib-documentation): Likewise.
(python-nbconvert): Likewise.
* gnu/packages/xfce.scm (xfdesktop): Likewise.
* gnu/packages/xorg.scm (hackneyed-x11-cursors): Likewise.
 2022-07-12 23:23:25 -04: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
Maxim Cournoyer
f7d88cd470
gnu: libsoup: Update to 3.0.1. 
* gnu/packages/gnome.scm (libsoup-minimal): Update to 3.0.1.
[modules]: Delete argument.
[phases]{adjust-tests}: Re-enable ssl-test.
[native-inputs]: Add gnutls, for tests.  Move nghttp2:lib to...
[propagated-inputs]: ... here.  Add nghttp2, which contains the pkg-config
files.
(vala-0.52): Add older variant.
(libsoup-minimal-2): New variable.
(rest)[propagated-inputs]: Use libsoup-minimal-2.
(geoclue)[inputs]: Likewise.
* gnu/packages/inkscape.scm (inkscape)[inputs]: Likewise.
 2021-11-11 12:18:18 -05:00
Maxim Cournoyer
50db3459cb
gnu: inkscape: Remove the legacy 0.92 version. 
The older 0.92 Inkscape package was previously kept because of problems
building lib2geom on the ARM architectures.  As this no longer appears to be a
problem (tested on the overdrive1 machine), finally replace the older Inkscape
by the newer 1.1 release.

* gnu/packages/inkscape.scm (inkscape-1.1): Delete variable, moving the
package definition to...
(inkscape): ... the now single inkscape variable.  Remove trailing #t.
[tests?]: Remove.
[phases]{generate-gdk-pixbuf-loaders-cache-file}: Add phase.
 2021-11-11 12:18:15 -05:00
Efraim Flashner
075df3d3e2
Merge remote-tracking branch 'origin/master' into core-updates-frozen 2021-11-03 14:27:51 +02:00
Tobias Geerinckx-Rice
0489e488de
gnu: inkscape@1.1: Update to 1.1.1. 
* gnu/packages/inkscape.scm (inkscape-1.1): Update to 1.1.1.
[source]: Remove patch.  Don't explicitly return #t from snippet.
[arguments]: Don't explicitly return #t from phases.
* gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
 2021-11-03 11:19:57 +01:00
Raghav Gururajan
50e0fa19f0
gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2. 
* gnu/packages/gtk.scm (gtkmm)[version]: Update to 4.2.0.
[arguments](meson): New argument.
[native-inputs]: Add glib:bin.
[propagated-inputs]: Replace gtk+ with gtk.
(gtkmm-3): New variable.
(gtkmm-2)[arguments]: Strip certain inherited arguments.
* gnu/packages/animation.scm (synfigstudio)[inputs]: Switch to gtkmm-3.
* gnu/packages/astronomy.scm (stackistry)[inputs]: Ditto.
* gnu/packages/audio.scm (guitarix)[inputs]: Ditto.
* gnu/packages/disk.scm (parted)[inputs]: Ditto.
* gnu/packages/gnome.scm (gnome-system-monitor)[inputs]: Ditto.
(workrave)[inputs]: Ditto.
(gnote)[inputs]: Ditto.
* gnu/packages/gobby.scm (gobby)[inputs]: Ditto.
* gnu/packages/inkscape.scm (inkscape)[inputs]: Ditto.
* gnu/packages/mail.scm (astroid)[inputs]: Ditto.
* gnu/packages/mate.scm (mate-system-monitor)[inputs]: Ditto.
* gnu/packages/music.scm (tascam-gtk)[inputs]: Ditto.
* gnu/packages/photo.scm (rawtherapee)[inputs]: Ditto.
* gnu/packages/pulseaudio.scm (pavucontrol)[inputs]: Ditto.
(paprefs)[inputs]: Ditto.
* gnu/packages/text-editors.scm (jucipp)[inputs]: Ditto.
* gnu/packages/wm.scm (waybar)[inputs]: Ditto.
 2021-10-02 10:54:13 +00:00
Marius Bakke
6f9a80b331
Merge branch 'master' into core-updates 
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.

4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.

 Conflicts:
	gnu/local.mk
	gnu/packages/aidc.scm
	gnu/packages/boost.scm
	gnu/packages/curl.scm
	gnu/packages/nettle.scm
	gnu/packages/networking.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tls.scm
 2021-06-19 17:38:47 +02:00
Boris A. Dekshteyn
624a6b60b5
gnu: inkscape: Update to version 1.1. 
* gnu/packages/patches/inkscape-1.1-fix-build-witch-gcc7.5.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/inkscape.scm (inkscape-1.0) Rename to inkscape-1.1.
* gnu/packages/inkscape.scm (inkscape-1.1) Update to version 1.1.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 2021-06-18 13:12:17 +02:00
Christopher Baines
e740cc6140
Merge branch 'master' into core-updates 2021-02-03 09:57:35 +00:00
Maxim Cournoyer
d42245d401
gnu: Adjust package collection to Wrap using GUIX_PYTHONPATH. 
This change was automated using:

$ git ls-files | grep .scm | \
  xargs sed 's/(getenv "PYTHONPATH")/(getenv "GUIX_PYTHONPATH")/' -i

$ git ls-files | grep .scm | \
  xargs sed 's/`("PYTHONPATH"/`("GUIX_PYTHONPATH"/' -i

* gnu/packages/admin.scm (nmap):
(dstat): Wrap using GUIX_PYTHONPATH.
* gnu/packages/audio.scm (jack-2):
(carla): Likewise.
* gnu/packages/benchmark.scm (fio): Likewise.
* gnu/packages/bioinformatics.scm (couger): Likewise.
(gess, find-circ, filtlong, nanopolish): Likewise.
* gnu/packages/cdrom.scm (cdemu-client): Likewise.
* gnu/packages/chemistry.scm (avogadro): Likewise.
* gnu/packages/connman.scm (econnman): Likewise.
* gnu/packages/cups.scm (hplip): Likewise.
* gnu/packages/debug.scm (scanmem): Likewise.
* gnu/packages/display-managers.scm (lightdm): Likewise.
* gnu/packages/ebook.scm (cozy): Likewise.
* gnu/packages/education.scm (anki): Likewise.
* gnu/packages/engineering.scm (kicad, volk, freecad): Likewise.
* gnu/packages/game-development.scm (renpy): Likewise.
* gnu/packages/games.scm (roguebox-adventures)
(seahorse-adventures, kajongg): Likewise.
* gnu/packages/gimp.scm (gimp, glimpse): Likewise.
* gnu/packages/glib.scm (itstool): Likewise.
* gnu/packages/gnome.scm (gnome-music, gtg, rhythmbox): Likewise.
(eolie, d-feet, gedit, caribou, gnome-shell, authenticator)
(gnome-todo, orca, passwordsafe, terminator, setzer)
(libratbag, komikku): Likewise.
* gnu/packages/gps.scm (gpsd): Likewise.
* gnu/packages/gtk.scm (gtk-doc): Likewise.
* gnu/packages/ibus.scm (ibus, ibus-libpinyin, ibus-anthy)
(ibus-libhangul): Likewise.
* gnu/packages/inkscape.scm (inkscape-1.0): Likewise.
* gnu/packages/linux.scm (bcc): Likewise.
* gnu/packages/mail.scm (notifymuch): Likewise.
* gnu/packages/maths.scm (units): Likewise.
* gnu/packages/music.scm (solfege): Likewise.
* gnu/packages/networking.scm (blueman): Likewise.
* gnu/packages/patchutils.scm (patchwork): Likewise.
* gnu/packages/photo.scm (rapid-photo-downloader, entangle): Likewise.
* gnu/packages/plotutils.scm (asymptote): Likewise.
* gnu/packages/presentation.scm (presentty): Likewise.
* gnu/packages/screen.scm (byobu): Likewise.
* gnu/packages/storage.scm (ceph): Likewise.
* gnu/packages/syndication.scm (liferea): Likewise.
* gnu/packages/task-management.scm (blanket): Likewise.
* gnu/packages/text-editors.scm (manuskript): Likewise.
* gnu/packages/version-control.scm (gitless, cgit, git-when-merged)
(git-imerge): Likewise.
* gnu/packages/video.scm (pitivi): Likewise.
* gnu/packages/virtualization.scm (criu): Likewise.
* gnu/packages/xfce.scm (catfish): Likewise.
 2021-02-01 11:54:01 -05:00
Michael Rohleder
f9bd4621dd
gnu: inkscape-1.0: Update to 1.0.2. 
* gnu/packages/inkscape.scm (inkscape-1.0): Update to 1.0.2.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
 2021-01-25 09:36:26 -05:00
Marius Bakke
7405593222
gnu: inkscape: Build with Python 3. 
* gnu/packages/inkscape.scm (inkscape)[inputs]: Change from PYTHON-2 to
PYTHON-WRAPPER.
 2020-12-19 22:27:17 +01:00
Ekaitz Zarraga
24b233d45c
gnu: inkscape: Correct extension dependencies. 
* gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Add wrap-program phase.
[inputs]: Move python-wrapper to inputs, and add several python libraries.
[native-inputs]: Remove python-wrapper, as it has moved to inputs.

Signed-off-by: Christopher Baines <mail@cbaines.net>
 2020-10-26 15:53:04 +00:00
Boris A. Dekshteyn
17d30d1f6e
gnu: inkscape-1.0: Update to 1.0.1. 
* gnu/packages/inkscape.scm (inkscape-1.0): Update to 1.0.1.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
 2020-09-21 19:39:25 +03:00
Maxim Cournoyer
1afa2c5ca0
gnu: inkscape: Add the glib-or-gtk-build-system phases. 
This fixes an issue where an improperly set XDG_DATA_DIRS environment variable
would cause a segfault when opening the 'Save As' menu of Inkscape.  See:
<https://lists.gnu.org/archive/html/help-guix/2020-06/msg00093.html>.

* gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Import the
(guix build glib-or-gtk-build-system) module.
[phases]: Add the glib-or-gtk-compile-schemas and glib-or-gtk-wrap phases.

Reported-by: Thorsten Wilms <t_w_@freenet.de>
 2020-06-14 23:16:33 -04:00
Maxim Cournoyer
ff8a1a88d9
gnu: inkscape: Add inkscape-1.0. 
* gnu/packages/inkscape.scm (inkscape-1.0): New variable.
* gnu/packages/gtk.scm (at-spi2-atk): Add a TODO comment.
 2020-05-31 22:12:13 -04:00
Marius Bakke
d930b0261c
gnu: inkscape: Remove obsolete workaround. 
* gnu/packages/inkscape.scm (inkscape)[arguments]: Remove phase
"dont-use-system-includes".
 2020-02-10 23:05:25 +01:00
Marius Bakke
1e5663e2e6
gnu: poppler: Update to 0.84.0. 
* gnu/packages/pdf.scm (poppler): Update to 0.84.0.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
'adjust-for-new-poppler'.
 2020-01-14 00:18:08 +01:00
Marius Bakke
1a753d5673
gnu: poppler: Update to 0.77.0. 
* gnu/packages/patches/inkscape-poppler-0.76.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/inkscape.scm (inkscape)[source](patches): New field.
* gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch: Add two new hunks.
* gnu/packages/pdf.scm (poppler): Update to 0.77.0.
* gnu/packages/tex.scm (texlive-bin)[source]: Update Arch patches.
[arguments]: Adjust accordingly.
* gnu/packages/scribus.scm (scribus)[source](patches): Add two new origins.
 2019-06-15 23:47:34 +02:00
Marius Bakke
0bba8a5cf8
gnu: inkscape: Fix FTBFS with GCC >= 6. 
* gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
'dont-use-system-includes.
 2019-02-09 21:53:42 +01:00
Leo Famulari
d680a8afd1
gnu: Inkscape: Update to 0.92.4. 
* gnu/packages/inkscape.scm (inkscape): Update to 0.92.4.
[source]: Remove obsolete patches.
 2019-01-18 18:45:37 -05:00
Ricardo Wurmus
bedf0535ff
gnu: inkscape: Add poppler compatibility patch. 
* gnu/packages/inkscape.scm (inkscape)[source]: Add second poppler
compatibility patch.
 2018-08-10 09:14:51 +02:00
Ricardo Wurmus
cda7f4bc8e
gnu: inkscape: Fix build with poppler. 
* gnu/packages/inkscape.scm (inkscape)[source]: Add upstream patch to fix
incompatibility with latest version of poppler.
 2018-06-29 22:09:36 +02:00
Danny Milosavljevic
20f5c86c3e
gnu: inkscape: Disable "icon-theme.cache" generation. 
* gnu/packages/inkscape.scm (inkscape)[arguments]<#:make-flags>: Delete.
<#:phases>[patch-icon-cache-generator]: Add phase.
 2018-05-15 14:30:23 +02:00
Arun Isaac
68376f6c88
gnu: inkscape: Build with potrace support. 
From Inkscape 0.92, potrace is required for the Paintbucket and Trace Bitmap
tools.

* gnu/packages/inkscape.scm (inkscape)[inputs]: Add potrace.
 2018-03-17 05:06:32 +05:30
Tobias Geerinckx-Rice
d773fef1ce
gnu: inkscape: Update to 0.92.3. 
* gnu/packages/inkscape.scm (inkscape): Update to 0.92.3.
[source]: Remove patch.
 2018-03-14 07:47:31 +01:00
Danny Milosavljevic
81ed306dee
gnu: inkscape: Disable duplicate icon cache generation. 
* gnu/packages/inkscape.scm (inkscape): Disable duplicate icon cache
generation.
 2018-03-04 15:44:34 +01:00
Tobias Geerinckx-Rice
50dc3b8b2f
gnu: inkscape: Use HTTPS for home page. 
* gnu/packages/inkscape.scm (inkscape)[home-page]: Use HTTPS.
 2018-01-11 03:16:01 +01:00
Tobias Geerinckx-Rice
2b7eda61cb
gnu: inkscape: Update to 0.92.2. 
* gnu/packages/inkscape.scm (inkscape): Update to 0.92.2.
 2018-01-11 03:16:01 +01:00
Marius Bakke
c4787c7831
gnu: inkscape: Fix FTBFS with Poppler >= 0.58. 
* gnu/packages/inkscape.scm (inkscape)[source]: Add upstream patch.
 2017-10-05 22:32:23 +02:00
Leo Famulari
fbbb1abf89
gnu: inkscape: Update to 0.92.1. 
* gnu/packages/inkscape.scm (inkscape): Update to 0.92.1.
 2017-02-17 17:56:36 -05:00
Ricardo Wurmus
68f9067324
gnu: inkscape: Update to 0.92.0. 
* gnu/packages/patches/inkscape-drop-wait-for-targets.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/inkscape.scm (inkscape): Update to 0.92.0.
[build-system]: Use "cmake-build-system".
[native-inputs]: Add glib:bin.
[arguments]: Remove obsolete arguments; disable tests.
 2017-01-04 18:06:44 +01:00
Ricardo Wurmus
3f62fa2b81
gnu: inkscape: Use modify-phases syntax. 
* gnu/packages/inkscape.scm (inkscape)[arguments]: Use modify-phases
syntax.
 2016-11-10 18:49:48 +01:00