Commit Graph

5350 Commits

Author SHA1 Message Date
github-actions[bot]
7c9f4934b8
Merge master into staging-next 2023-03-19 12:01:32 +00:00
Stanisław Pitucha
22ce42ab03
Merge pull request #221965 from viraptor/icon-library-darwin
icon-library: fix darwin build
2023-03-19 18:38:41 +11:00
Stanisław Pitucha
57accc032c icon-library: fix darwin build
Add the required framework.
2023-03-19 16:43:50 +11:00
github-actions[bot]
c70342c89c
Merge master into staging-next 2023-03-19 00:02:27 +00:00
Weijia Wang
7f5a37392d cl, wings: unbreak on aarch64-linux 2023-03-18 18:39:59 +02:00
github-actions[bot]
7f0b38bc9a
Merge master into staging-next 2023-03-18 14:00:45 +00:00
Thomas Gerbet
b3cf05383e jpegoptim: apply patch for CVE-2023-27781
See https://github.com/tjko/jpegoptim/issues/132
2023-03-18 11:51:45 +01:00
github-actions[bot]
36748936f9
Merge master into staging-next 2023-03-18 06:01:16 +00:00
Nick Cao
bdfcaa4ba3
Merge pull request #221704 from dotlambda/rnote-0.5.18
rnote: 0.5.17 -> 0.5.18
2023-03-18 10:07:51 +08:00
github-actions[bot]
2c8e6963dc
Merge master into staging-next 2023-03-18 00:02:30 +00:00
Chuang Zhu
b7a3087658 komikku: init at 1.15.0 2023-03-17 21:00:34 -03:00
Weijia Wang
ac16f025ee rapid-photo-downloader: fix build 2023-03-17 21:07:29 +02:00
Robert Schütz
e3f324babf rnote: 0.5.17 -> 0.5.18
Diff: https://github.com/flxzt/rnote/compare/v0.5.17...v0.5.18

Changelog: https://github.com/flxzt/rnote/releases/tag/v0.5.18
2023-03-17 11:18:36 -07:00
github-actions[bot]
d761f69867
Merge master into staging-next 2023-03-17 17:57:00 +00:00
Jan Tojnar
a869e4849c
Merge pull request #221660 from jtojnar/gimp-break-python2
gimpPlugins.resynthesizer: Mark as broken for GIMP without Python 2 support
2023-03-17 16:37:58 +01:00
Robert Schütz
33255fd1d1
Merge pull request #221519 from dotlambda/rnote-0.5.17
rnote: 0.5.16 -> 0.5.17
2023-03-17 07:59:41 -07:00
Jan Tojnar
4b023832f8 gimpPlugins.resynthesizer: Mark as broken for GIMP without Python 2 support 2023-03-17 15:22:12 +01:00
Jan Tojnar
69e4b68ae9 gimp: Expose Python 2 support 2023-03-17 15:22:12 +01:00
Jan Tojnar
ed923bb61d gimp: Use env attribute for environment variables
This is in preparation for __structuredAttrs.
2023-03-17 15:22:12 +01:00
Jan Tojnar
29638c4a7e gimp-with-plugins: Use consistent GIMP version
In case `gimp` attribute from `gimpPlugins` scope is overridden to something different than the top-level one.
2023-03-17 15:04:32 +01:00
Jan Tojnar
94f5d6e5c2 gimp: Switch to finalAttrs
This will keep the attributes consistent with overrides.
2023-03-17 14:50:47 +01:00
Jonas Heinrich
da6aa9cd7d
Merge pull request #221448 from wegank/autotrace-bump
autotrace: 0.31.1 -> 0.31.9
2023-03-17 14:39:18 +01:00
github-actions[bot]
2394986204
Merge master into staging-next 2023-03-17 12:01:17 +00:00
Weijia Wang
fb1df3cb5a
Merge pull request #221602 from dali99/update_hydrus2
hydrus: 519 -> 520
2023-03-17 10:08:50 +02:00
Robert Schütz
cce8dfae83 rnote: also build on Darwin 2023-03-16 23:33:25 -07:00
github-actions[bot]
6746017444
Merge master into staging-next 2023-03-17 00:02:33 +00:00
Robert Schütz
58ab7a74ba rnote: 0.5.16 -> 0.5.17
Diff: https://github.com/flxzt/rnote/compare/v0.5.16...v0.5.17

Changelog: https://github.com/flxzt/rnote/releases/tag/v0.5.17
2023-03-16 15:48:57 -07:00
Artturi
081e69ca4d
Merge pull request #221467 from alyssais/imagemagick-config 2023-03-16 22:14:51 +02:00
Francesco Gazzetta
2456b9737b
Merge pull request #220965 from fgaz/vengi-tools/0.0.24
vengi-tools: 0.0.23 -> 0.0.24
2023-03-16 20:05:17 +00:00
github-actions[bot]
455127ad5e
Merge master into staging-next 2023-03-16 18:01:20 +00:00
Jan Tojnar
a5c58fae72
shotwell: 0.31.5 → 0.31.7
https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.31.5...shotwell-0.31.7

Co-authored-by: Bobby Rong <rjl931189261@126.com>
Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2023-03-16 21:37:02 +08:00
Alyssa Ross
00d1feaed3
imagemagick: use the right pkg-config in *-config
If we're building buildPackages.imagemagick, the imagemagick libraries
will be built for the local system, but we were previously using the
pkg-config for the cross system in the *-config scripts bundled with
ImageMagick.  I suspect the reason it wasn't noticed for a long time
was that packages that are using still old-style *-config scripts
instead of pkg-config probably don't cross compile anyway.  I noticed
because I wondered why buildPackages.imagemagick when cross-compiling
was not the same as my native imagemagick, so as a happy side effect
of this change, users won't have to rebuild imagemagick any more when
it's used as a native build input for a cross-compiled package.
2023-03-16 10:45:46 +00:00
Vladimír Čunát
0f9354bfee
Merge #218309: ffmpeg: ffmpeg_4 → ffmpeg_5
...into staging
2023-03-16 11:11:31 +01:00
Weijia Wang
6c072b2db2 autotrace: 0.31.1 -> 0.31.9 2023-03-16 11:05:46 +02:00
Daniel Olsen
7915ba2644 hydrus: 519 -> 520 2023-03-16 03:16:48 +01:00
Martin Weinelt
1c52b361a8
Merge remote-tracking branch 'origin/master' into staging-next 2023-03-15 14:36:40 +01:00
Pavol Rusnak
3d02414b60
Merge pull request #221313 from lilyinstarlight/upd/kodelife-1.0.8.170
kodelife: 1.0.6.163 → 1.0.8.170
2023-03-15 14:35:49 +01:00
Lily Foster
9f09dacbfd
kodelife: 1.0.6.163 → 1.0.8.170 2023-03-15 12:21:11 +00:00
Vladimír Čunát
aeb7c79ee4
Merge branch 'master' into staging-next 2023-03-15 09:41:30 +01:00
Weijia Wang
a5772cae76
Merge pull request #197991 from dali99/update_hydrus2
hydrus: 503 -> 519, switch to qt6
2023-03-15 08:07:25 +02:00
Atemu
f8264a5b1e tree-wide: mark broken packages as such
Found while changing ffmpeg from 4 to 5; these all depend on ffmpeg either
directly or transitively.
2023-03-13 16:43:06 -06: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
Martin Weinelt
bb14c4255b Merge remote-tracking branch 'origin/master' into staging-next 2023-03-13 17:14:19 +00:00
Lassulus
766852c57c
Merge pull request #220970 from wegank/aarch64-unbreak 2023-03-14 00:04:56 +07:00
Kerstin
d29e58296a
Merge pull request #220700 from dotlambda/imagemagick-7.1.1-2
imagemagick: 7.1.1-0 -> 7.1.1-2
2023-03-13 15:23:25 +01:00
Weijia Wang
7ee078619a tev: unbreak on aarch64-linux 2023-03-13 12:16:26 +02:00
Francesco Gazzetta
87d7fb45da vengi-tools: 0.0.23 -> 0.0.24 2023-03-13 10:22:49 +01:00
Vladimír Čunát
1f7eeea8ee
Merge branch 'master' into staging-next 2023-03-12 17:21:00 +01:00
Guillaume Girol
4c7f6deef1
Merge pull request #216017 from symphorien/sane_1.2.1
sane-backends: 1.1.1 -> 1.2.1
2023-03-12 15:08:37 +00:00
Martin Weinelt
5abe72f0b2 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/mdutils/default.nix
2023-03-12 15:59:15 +01:00