Commit Graph

2377 Commits

Author SHA1 Message Date
Kira Bruneau
624432c25b
Merge pull request #220288 from r-ryantm/auto-update/vkbasalt
vkbasalt: 0.3.2.8 -> 0.3.2.9
2023-03-10 14:35:23 -05:00
R. Ryantm
3f8dc17c26 vkbasalt: 0.3.2.8 -> 0.3.2.9 2023-03-10 14:28:18 -05:00
Alyssa Ross
d60c3be234 glmark2: enable more flavors 2023-03-10 09:34:06 +00:00
Alyssa Ross
44e32d9dc0 glmark2: remove unused xorg.libxcb input
X11 flavors work fine without it.
2023-03-10 09:34:06 +00:00
Alyssa Ross
b80dd48f26 glmark2: fix cross 2023-03-10 09:34:06 +00:00
Alyssa Ross
48532d5957 glmark2: switch to meson
The bundled waf is so old it doesn't support cross-compilation.
2023-03-10 09:34:06 +00:00
Ilan Joselevich
b25c0d045b
Merge pull request #219168 from r-ryantm/auto-update/gnuplot
gnuplot: 5.4.5 -> 5.4.6
2023-03-06 22:48:03 +02:00
Vladimír Čunát
87daa5b06a
Merge #218074: gmic-qt: fix build with 3.2.1 2023-03-04 14:51:53 +01:00
R. Ryantm
688c4961cf gnuplot: 5.4.5 -> 5.4.6 2023-03-02 12:17:17 +00:00
Lily Foster
fd3e2b49f4
gmic-qt: fix build with 3.2.1
How the build was fixed:
* Fetch tarball instead since that is what upstream supports to build
  gmic-qt from.
* Set `sourceRoot` within tarball
* Fetch patch from GreycLab/gmic#435 into gmic
* Fetch patch from c-koi/gmic-qt#175 into gmic-qt
2023-02-26 07:13:09 -05:00
Weijia Wang
d178040d90
Merge pull request #218159 from r-ryantm/auto-update/asymptote
asymptote: 2.83 -> 2.85
2023-02-26 12:03:55 +02:00
Vladimír Čunát
30e272bc04
Merge #216499: staging-next 2023-02-15 2023-02-26 10:11:50 +01:00
R. Ryantm
a15c903b4b hobbits: 0.53.2 -> 0.54.0 2023-02-25 14:44:04 +00:00
R. Ryantm
c9ff9afbad asymptote: 2.83 -> 2.85 2023-02-25 04:24:26 +00:00
Lily Foster
626a0ff9fa
gmic: fix linking against shared lib with cmake 2023-02-24 15:03:53 -05:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Artturin
226e149145 treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
github-actions[bot]
77f501b5df
Merge master into staging-next 2023-02-22 06:01:21 +00:00
Anderson Torres
6e442a3dee
Merge pull request #217187 from jtojnar/gmic-qt-fix
gmic,gmic-qt: 3.2.0 → 3.2.1, mark the latter as broken
2023-02-21 22:16:38 -03:00
github-actions[bot]
e3e8374b6f
Merge master into staging-next 2023-02-21 00:02:33 +00:00
Jörg Thalheim
a891613ead
Merge pull request #217227 from mothsART/feature/replace_http_by_https__second_pass
treewide: replace http by https when https is a permanent redirection
2023-02-20 21:33:05 +01:00
github-actions[bot]
4a14359163
Merge master into staging-next 2023-02-20 00:02:26 +00:00
Jan Tojnar
63e4a92217 gmic-qt: Mark as broken
Ever since the gmic 3.2.0 bump, it just does not build – it tries to use stub definitions for gmic_image from src/GmicQt.h, leading to errors like:

    /build/source/src/GmicQt.cpp:344:11: error: 'struct gmic_library::gmic_image<unsigned char>' has no member named 'channels'
      344 |       img.channels(0, 3);
          |       ~~~~^~~~~~~~

gmic-qt 3.2.1 contains a supposed fix (f0d9d8acd1) which might have actually fixed the gmic_image issue but it introduces another one with cimg.

    gmic-3.2.1-dev/include/gmic.h:191:21: fatal error: gmic.cpp: No such file or directory
      191 | #define cimg_plugin "gmic.cpp"
          |                     ^~~~~~~~~~

I do not really understand qmake, deprecated build system which gmic author insists on using for gmic-qt, and the trio of libraries is convoluted enough (mutually including their various headers and source files) that I gave up on creating an usable CMake build script that supports system libraries. It does not help that the git history is obfuscated, making proper investigation annoying.

Marking it as broken will at least make gimp-with-plugins work.
2023-02-19 22:56:19 +01:00
Jan Tojnar
e00fa961ed gmic-qt: Add gimp plug-in to passthru.tests 2023-02-19 22:56:19 +01:00
Ferry Jérémie
bfac2d0034 treewide:replace http by https when https is a permanent redirection 2023-02-19 21:47:59 +01:00
Jan Tojnar
24f2c744c7 gmic-qt: 3.2.0 → 3.2.1
https://github.com/c-koi/gmic-qt/compare/v.3.2.0...v.3.2.1
2023-02-19 18:00:35 +01:00
Jan Tojnar
02be63faed gmic-qt: add update script 2023-02-19 18:00:34 +01:00
Jan Tojnar
8e9e60c483 gmic: 3.2.0 → 3.2.1 2023-02-19 18:00:34 +01:00
Jan Tojnar
c4d80af5bd gmic: fix update script
It got broken by the 3.2.0 bump: 2dd0b25e16
2023-02-19 18:00:34 +01:00
Jan Tojnar
a07960652c gmic: Add gmic-qt to passthru.tests
It often needs to be updated in lockstep.
2023-02-19 18:00:09 +01:00
R. Ryantm
0d8f0e5387 nip2: 8.7.1 -> 8.9.1 2023-02-19 06:23:44 +00:00
github-actions[bot]
a1eb3e0b3e
Merge master into staging-next 2023-02-19 00:02:27 +00:00
Joachim Breitner
ea4d2f7e61
ploticus: Fix PREFAB settings, add test
Previously, I would get

    pl: error 22: Cannot open specified scriptfile (@out@/share/ploticus/prefabs/chron.pl)

and it seems the PREFAB setting last changed in
fbc4b41e69
didn't quite work.

So this adds a test to demonstrate the issue, and fixes it by substituting the placeholder.
2023-02-18 21:34:52 +01:00
github-actions[bot]
c4fe2133de
Merge staging-next into staging 2023-02-15 06:01:44 +00:00
Sandro
c9fbcf0416
Merge pull request #215074 from dotlambda/vips-8.14.1 2023-02-15 01:09:07 +01:00
Alyssa Ross
200610b849
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/libraries/gtest/default.nix
	pkgs/development/libraries/hidapi/default.nix
2023-02-14 09:53:03 +00:00
Sebastian Neubauer
25f34241cd vulkan-cts: 1.3.4.1 -> 1.3.5.0 2023-02-13 20:56:08 +01:00
github-actions[bot]
29c2637dda
Merge staging-next into staging 2023-02-13 12:02:05 +00:00
github-actions[bot]
fd8daee7c2
Merge master into staging-next 2023-02-13 12:01:30 +00:00
Kerstin
4b6792fb6f
Merge pull request #216105 from r-ryantm/auto-update/wgpu-utils
wgpu-utils: 0.15.0 -> 0.15.1
2023-02-13 12:48:55 +01:00
github-actions[bot]
29cdca7736
Merge staging-next into staging 2023-02-13 06:02:02 +00:00
R. Ryantm
d9cf62f012 wgpu-utils: 0.15.0 -> 0.15.1 2023-02-13 02:25:37 +00:00
Alyssa Ross
c6c7493c3b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pyarrow/default.nix
2023-02-13 00:15:28 +00:00
Robert Scott
ba40f8ea1c
Merge pull request #210409 from r-ryantm/auto-update/leptonica
leptonica: 1.82.0 -> 1.83.0
2023-02-12 19:04:25 +00:00
github-actions[bot]
0417b0e54f
Merge staging-next into staging 2023-02-10 00:03:00 +00:00
github-actions[bot]
71c0c6d984
Merge master into staging-next 2023-02-10 00:02:27 +00:00
Robert Schütz
ac17c2b4b3 pgf_graphics: 6.14.12 -> 7.21.7 2023-02-09 09:17:26 -08:00
github-actions[bot]
bd14a95898
Merge staging-next into staging 2023-02-09 06:01:47 +00:00
github-actions[bot]
73fe6149d4
Merge master into staging-next 2023-02-09 06:01:10 +00:00