Commit Graph

2493 Commits

Author SHA1 Message Date
Vladimír Čunát
fd77cd7a01
Merge branch 'master' into staging-next
Indentation conflict in vulkan-related src fetches.
2023-04-08 11:33:08 +02:00
Ilan Joselevich
d9f759f2ea
Merge pull request #224650 from Kranzes/vulkan-sdk-update-script
vulkan-headers: add update script
2023-04-08 12:19:06 +03:00
github-actions[bot]
75e19b98bb
Merge master into staging-next 2023-04-08 00:02:03 +00:00
Artturi
094c82d9d9
Merge pull request #200366 from considerate/netpbm 2023-04-07 21:07:29 +03:00
github-actions[bot]
ad0239e550
Merge staging-next into staging 2023-04-05 00:03:07 +00:00
Lily Foster
0bb8291660 gmic-qt: 3.2.2 -> 3.2.3 2023-04-04 20:06:32 -03:00
R. Ryantm
dc2c96df1d gmic: 3.2.2 -> 3.2.3 2023-04-04 20:06:32 -03:00
Ilan Joselevich
244eeefe05
Merge pull request #224485 from PedroHLC/vulkan-sdk-1.3.243-master
vulkan-sdk: 1.3.239 -> 1.3.243
2023-04-04 22:19:43 +03:00
Ilan Joselevich
ee9df2c1a8
vulkan-headers: add update script 2023-04-04 15:52:36 +03:00
PedroHLC ☭
e3ee688b5d
vulkan-extension-layer: 1.3.239.0 -> 1.3.243.0 2023-04-03 11:48:30 -03:00
PedroHLC ☭
275bfd93ea
vulkan-tools-lunarg: 1.3.239.0 -> 1.3.243.0 2023-04-03 11:48:12 -03:00
PedroHLC ☭
5481d74a29
vulkan-tools: 1.3.239.0 -> 1.3.243.0 2023-04-03 11:47:57 -03:00
PedroHLC ☭
0bd070e1bc
spirv-cross: 1.3.239.0 -> 1.3.243.0 2023-04-03 11:46:58 -03:00
Mario Rodas
f3f37ac1e5
Merge pull request #223688 from r-ryantm/auto-update/resvg
resvg: 0.29.0 -> 0.30.0
2023-03-29 07:35:44 -05:00
Weijia Wang
d805a34669
Merge pull request #222868 from r-ryantm/auto-update/netpbm
netpbm: 11.1.0 -> 11.2.0
2023-03-29 09:08:09 +03:00
R. Ryantm
a2e172e0f8 resvg: 0.29.0 -> 0.30.0 2023-03-29 04:25:02 +00:00
Weijia Wang
32e38f42df
Merge pull request #222954 from r-ryantm/auto-update/vips
vips: 8.14.1 -> 8.14.2
2023-03-28 17:31:08 +03:00
Nick Cao
ca46c51067
Merge pull request #223385 from Flakebi/vulkan-cts
vulkan-cts: 1.3.5.0 -> 1.3.5.1
2023-03-28 09:17:11 +08:00
Sebastian Neubauer
5f29c19fab vulkan-cts: 1.3.5.0 -> 1.3.5.1 2023-03-27 15:27:27 +02:00
github-actions[bot]
ff3e86d2b4
Merge master into staging-next 2023-03-26 06:01:06 +00:00
Yureka
f8cbc3c281 tree-wide: convert rust with git deps to importCargoLock 2023-03-26 01:52:04 +01:00
R. Ryantm
1b4f8f9b16 netpbm: 11.1.0 -> 11.2.0 2023-03-25 13:20:40 +00:00
github-actions[bot]
1f2e655ca9
Merge master into staging-next 2023-03-25 12:01:33 +00:00
Stanisław Pitucha
4ae95d7842 aaphoto: fix darwin build
Add the llvm openmp for building.
2023-03-25 09:00:03 -03:00
R. Ryantm
f50a1657de vips: 8.14.1 -> 8.14.2 2023-03-24 21:23:07 +00:00
Vladimír Čunát
12dd95fbb1
Merge branch 'master' into staging-next 2023-03-24 09:07:41 +01:00
K900
2607d40e58 mesa-demos: 8.5.0 -> 9.0.0
Now with vkgears!
2023-03-22 18:36:27 +03:00
github-actions[bot]
797a2b9bcc
Merge master into staging-next 2023-03-21 18:01:07 +00:00
Lily Foster
dc1fda492a cimg,gmic,gmic-qt: add lilyinstarlight to maintainers 2023-03-21 13:52:49 -03:00
Lily Foster
fc457d46c4 gmic: update license to cecill21
As of G'MIC version 2.1.9, it uses the 2.1 version of the CeCILL
license plus a few files which are dual licensed with CeCILL-C (excluded
here since there's no good way to specify which files and it's can be
one or the other).
2023-03-21 13:52:49 -03:00
Lily Foster
126b3d60f6 gmic-qt: 3.2.1 -> 3.2.2
This commit also removes a few unused arguments and prepares the
derivation for qt6 by removing the usage of `qt5.mkDerivation` which is
a little broken and likely to be deprecated (see NixOS/nixpkgs#180841).
2023-03-21 13:52:49 -03:00
Lily Foster
6d5359557f gmic: 3.2.1 -> 3.2.2
Also perform drive-by change to fix repo owner, since the repository was
moved a while ago.
2023-03-21 13:52:49 -03:00
github-actions[bot]
f785fd289c
Merge master into staging-next 2023-03-20 12:01:29 +00:00
Fabian Affolter
b6b51871b5
Merge pull request #196974 from techknowlogick/add-shot-scraper
shot-scraper: init at 1.1.1
2023-03-20 10:09:01 +01:00
Fabian Affolter
910b639bff
shot-scraper: add changelog to meta 2023-03-20 09:17:15 +01:00
techknowlogick
76b5525a6d shot-scraper: init at 1.1.1 2023-03-19 23:17:41 -04:00
github-actions[bot]
84c97a9e91
Merge master into staging-next 2023-03-19 18:00:59 +00:00
figsoda
8882509ca9
Merge pull request #221989 from r-ryantm/auto-update/wgpu-utils
wgpu-utils: 0.15.1 -> 0.15.2
2023-03-19 10:59:44 -04:00
R. Ryantm
efb0a655fe wgpu-utils: 0.15.1 -> 0.15.2 2023-03-19 09:33:46 +00:00
github-actions[bot]
4d82a453fb
Merge master into staging-next 2023-03-19 06:01:10 +00:00
R. Ryantm
12b437b5e3 gifski: 1.10.0 -> 1.10.3 2023-03-19 02:50:50 +00:00
github-actions[bot]
2394986204
Merge master into staging-next 2023-03-17 12:01:17 +00:00
superherointj
9b0777ffb3
Merge pull request #221631 from PedroHLC/vulkan-caps-viewer-3.29
vulkan-caps-viewer: 3.28 -> 3.29
2023-03-17 08:39:08 -03:00
PedroHLC ☭
145ce73933
vulkan-caps-viewer: 3.28 -> 3.29 2023-03-17 08:07:09 -03:00
github-actions[bot]
455127ad5e
Merge master into staging-next 2023-03-16 18:01:20 +00:00
Vladimír Čunát
0f9354bfee
Merge #218309: ffmpeg: ffmpeg_4 → ffmpeg_5
...into staging
2023-03-16 11:11:31 +01:00
R. Ryantm
cb65372eaa dpic: 2021.11.01 -> 2023.02.01 2023-03-16 01:35:00 +00:00
Martin Weinelt
19680e9902
Merge pull request #217568 from trofi/stdenv-parallel-install
stdenv/generic/setup.sh: enable parallel installs for parallel builds
2023-03-15 17:10:19 +00:00
Atemu
9bd2506458 treewide: make ffmpeg_4-dependant packages depend on ffmpeg_4
These packages were identified as broken when ffmpeg = ffmpeg_5.

Tested _only_ by building them. If you are a maintainer of one of these
packages, please test whether your package still works.
2023-03-13 16:42:22 -06:00
github-actions[bot]
feb117e32c
Merge master into staging-next 2023-03-11 18:01:19 +00:00
Weijia Wang
80a0a547de
Merge pull request #219939 from r-ryantm/auto-update/directx-shader-compiler
directx-shader-compiler: 1.7.2212 -> 1.7.2212.1
2023-03-11 19:19:55 +02:00
Martin Weinelt
a7c2874462 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/roombapy/default.nix
2023-03-10 21:04:22 +01:00
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
Martin Weinelt
ef91384e6f Merge remote-tracking branch 'origin/master' into staging-next 2023-03-10 13:09:25 +01: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
Sergei Trofimovich
04cc3ff7d3 asymptote: disable install parallelism
Without the change parallel installs fail as:

    ...-coreutils-9.1/bin/install: cannot stat 'asy-keywords.el': No such file or directory
    make: *** [Makefile:272: install-asy] Error 1
2023-03-09 22:05:53 +00:00
R. Ryantm
14af7c5a37 directx-shader-compiler: 1.7.2212 -> 1.7.2212.1 2023-03-07 06:35:52 +00:00
github-actions[bot]
fa94414f70
Merge master into staging-next 2023-03-07 00:02:41 +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
github-actions[bot]
aca2797c2a
Merge master into staging-next 2023-03-04 18:01:11 +00: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
Sergei Trofimovich
e7e072d05a Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/top-level/python-aliases.nix

Trivial conflict of multiple added aliases.
2023-02-26 21:53:22 +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
github-actions[bot]
3cdd771820
Merge staging-next into staging 2023-02-23 18:01:49 +00: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]
f95edd46da
Merge staging-next into staging 2023-02-22 06:01:53 +00: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]
fc3641aa1e
Merge staging-next into staging 2023-02-21 00:03:04 +00: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
7c6f434c
a813b69dcc
Merge pull request #209461 from r-ryantm/auto-update/graphviz
graphviz: 7.0.2 -> 7.1.0
2023-02-20 06:35:30 +00:00
github-actions[bot]
539195e509
Merge staging-next into staging 2023-02-20 00:03:04 +00: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
Martin Weinelt
9e7f9a402b
python310Packages.mako: Normalize attribute, pname, dirname 2023-02-19 21:36:02 +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