Commit Graph

4766 Commits

Author SHA1 Message Date
Janne Heß
09438ed9ce
Merge pull request #173968 from symphorien/scantailor-advanced-zhf
scantailor-advanced: fix build with qt5.15 by switching to a maintained fork
2022-05-23 11:01:21 +02:00
Thomas Gerbet
c3182eace3 panotools: 2.9.20 -> 2.9.21
Fixes CVE-2021-33293

https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.21/
2022-05-22 18:45:16 +02:00
Guillaume Girol
6e17b6945c scantailor-advanced: fix build with qt5.15 by switching to a maintained fork
https://github.com/4lex4/scantailor-advanced/issues/170#issuecomment-1030857156
2022-05-22 12:00:00 +00:00
Rick van Schijndel
35e19f9daa
Merge pull request #173865 from trofi/workaround-fno-common-for-jpeg-archive
jpeg-archive: add -fcommon workaround
2022-05-21 16:00:51 +02:00
Sergei Trofimovich
ed01f5bd6d jpeg-archive: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: src/util.o:(.bss+0x0): multiple definition of `progname'; /build/ccBZT2Za.o:(.bss+0x20): first defined here
2022-05-21 11:20:01 +01:00
Sergei Trofimovich
4fc2a31536 glabels: pull fix pending upstream inclusion for -fno-common toolchain support
Without the change builds fails on upstream gcc-10 as:

    ld: label.o:src/template-history.h:31: multiple definition of `gl_template_history'; glabels-batch.o:src/template-history.h:31: first defined here
    ld: label-text.o:src/font-history.h:31: multiple definition of `gl_font_history'; glabels-batch.o:src/font-history.h:31: first defined here
    ld: font-history.o:src/font-history.h:31: multiple definition of `gl_font_history'; glabels-batch.o:src/font-history.h:31: first defined here
    ld: template-history.o:src/template-history.h:31: multiple definition of `gl_template_history'; glabels-batch.o:src/template-history.h:31: first defined here
2022-05-21 10:38:52 +01:00
Thomas Watson
4c711c386a cloudcompare: 2.12.0 -> 2.12.1, fix build
Fixes build by using PDAL 2.3.0 as there are problems with 2.4.0.
2022-05-20 19:09:38 -05:00
Robert Schütz
6501ee65b0 imagemagick: 7.1.0-34 -> 7.1.0-35 2022-05-20 14:48:37 +02:00
Valentine Valyaeff
dae4350d25 shotwell: fix video thumbnails
Video thumbnails generation was broken without these dependencies.
2022-05-19 20:56:26 +03:00
Jacek Galowicz
f7897d42b2
Merge pull request #173589 from alyssais/drawio-headless
drawio-headless: extract from pandoc-drawio-filter
2022-05-19 11:12:08 +02:00
Alyssa Ross
3e3d98cbb3
drawio-headless: extract from pandoc-drawio-filter
This wrapper is useful independently of pandoc-drawio-filter — it's
useful in any other situation in which somebody might want to use
draw.io diagrams in a build process.

So, make it accessible from the top level to facilitate reuse.
2022-05-19 08:20:50 +00:00
Sergei Trofimovich
223b8e5db5
Merge pull request #173055 from trofi/workaround-fno-common-for-grafx2
grafx2: add -fcommon workaround
2022-05-19 07:12:19 +00:00
Robert Schütz
4a1344693d megapixels: use wrapGAppsHook4 2022-05-18 12:38:50 -07:00
DarkOnion0
6f0d3c8ec7
drawio: 18.0.4 -> 18.0.6 2022-05-17 18:05:05 +02:00
Robert Schütz
8896e8d373 imagemagick: 7.1.0-33 -> 7.1.0-34 2022-05-17 15:19:58 +02:00
Ivar Scholten
578589e1da treewide: remove unneeded dotnet SDK version pins
These derivations use buildDotnetModule, which has had its default
dotnet version changed recently. This patch removes redundantly setting
the SDK/runtime to version 6.
2022-05-16 21:39:47 +02:00
omg
d62f3acd4d photoflare: 1.6.7.1 -> 1.6.10 2022-05-16 10:47:02 +04:00
Rick van Schijndel
05dee02f92 nomacs: mark broken on darwin
Already broken for a few years and nobody complained yet,
so just gonna make it clear that it's broken.
2022-05-15 23:22:15 +02:00
Jörg Thalheim
2c260a40e0
Merge pull request #173173 from DarkOnion0/drawio
drawio: 18.0.1 -> 18.0.4
2022-05-15 20:37:18 +01:00
DarkOnion0
222d84a2b7
drawio: 18.0.1 -> 18.0.4 2022-05-15 19:21:18 +02:00
Sergei Trofimovich
85b0aa8d4d grafx2: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of
      `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here
2022-05-14 17:55:46 +01:00
Robert Schütz
92e0e80f67 rnote: 0.5.1-hotfix-1 -> 0.5.3
https://github.com/flxzt/rnote/releases/tag/v0.5.2
https://github.com/flxzt/rnote/releases/tag/v0.5.3
2022-05-14 08:00:29 -07:00
Thiago Kenji Okada
eae1669de5
Merge pull request #171836 from ncfavier/escape-wrapper-args
Fix wrapper arguments escaping
2022-05-12 21:55:06 +01:00
Rick van Schijndel
9ef1af9aa3 rapcad: drop
Broken since 2018
2022-05-10 22:21:09 +02:00
Artturi
db137956d6
Merge pull request #172263 from otavio/topic/apngasm-3110
apngasm: 3.1.9 -> 3.1.10
2022-05-10 06:17:01 +03:00
Otavio Salvador
7565c2e455 apngasm: 3.1.9 -> 3.1.10
3.1.9 had issues with building and 3.1.10 has been released fixing
those; a parallel building error has been found and it is fixed on
Gentoo repository, from where we grab the patch from.

Log of error: https://hydra.nixos.org/log/6nh56zf7y81p0m6xxynw22wj1kaxrjbd-apngasm-3.1.9.drv
Refs: ZHF: #172160
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-05-09 21:39:27 -03:00
Artturin
49b62442e9 image_optim: remove useless nulls 2022-05-10 01:01:00 +03:00
Sandro
94d02e4e32
Merge pull request #172141 from trofi/workaround-fno-common-for-gqview
gqview: add -fcommon workaround
2022-05-09 12:06:51 +02:00
Sergei Trofimovich
6c60d3d38a gqview: add -fcommon workaround
Without the change build fails on -fno-common toolchains like upstream
gcc-10 as:

    $ nix build -L --impure --expr 'with import ./. {}; gqview.overrideAttrs (oa: {   NIX_CFLAGS_COMPILE = (["-fno-common"] ++ [oa.NIX_CFLAGS_COMPILE or ""]); })'
    ...
    ld: pan-view.o:/build/gqview-2.1.5/src/bar_exif.h:27:
      multiple definition of `bar_exif_key_list'; bar_exif.o:/build/gqview-2.1.5/src/bar_exif.h:27: first defined here
2022-05-09 08:20:31 +01:00
Robert Schütz
f42f88bd15 rnote: 0.5.0-hotfix-2 -> 0.5.1-hotfix-1
https://github.com/flxzt/rnote/releases/tag/v0.5.1-hotfix-1
2022-05-08 22:36:45 -07:00
github-actions[bot]
f39e774f11
Merge master into staging-next 2022-05-09 00:02:27 +00:00
Ryan Mulligan
2a77fee558
Merge pull request #171629 from r-ryantm/auto-update/hydrus
hydrus: 482 -> 483
2022-05-08 15:49:20 -07:00
Rick van Schijndel
d4aca509e6
Merge pull request #171931 from RamKromberg/fix/jpegrescan
jpegrescan: 2016-06-01 -> 2019-03-27
2022-05-08 22:47:57 +02:00
Robert Schütz
2f677eae73 imagemagick: 7.1.0-32 -> 7.1.0-33 2022-05-08 13:39:30 -07:00
Ram Kromberg
d9c321639c jpegrescan: 2016-06-01 -> 2019-03-27 2022-05-07 11:36:41 +03:00
Naïm Favier
545a1eddcd
megapixels: fix wrapper arguments escaping 2022-05-06 18:27:02 +02:00
Naïm Favier
8fe47199cc
image_optim: fix wrapper arguments escaping 2022-05-06 18:26:39 +02:00
Vladimír Čunát
8ad52489e9
Merge branch 'master' into staging-next 2022-05-06 16:07:25 +02:00
Robert Schütz
c767cecaad rnote: 0.4.0 -> 0.5.0-hotfix-2
https://github.com/flxzt/rnote/releases/tag/v0.5.0-hotfix-2
2022-05-06 06:17:17 -07:00
github-actions[bot]
6e0aca3c43
Merge master into staging-next 2022-05-06 12:02:02 +00:00
Bobby Rong
3d93ea9f5b
Merge pull request #171706 from DarkOnion0/master
drawio: 17.4.2 -> 18.0.1
2022-05-06 17:09:56 +08:00
github-actions[bot]
b962dee3e7
Merge master into staging-next 2022-05-06 00:02:16 +00:00
Jan Tojnar
1cc16e71e1
Merge pull request #167372 from r-ryantm/auto-update/poppler-glib
poppler: 22.03.0 -> 22.04.0
2022-05-06 00:47:20 +02:00
DarkOnion0
e06ba92957
drawio: 17.4.2 -> 18.0.1 2022-05-05 22:27:47 +02:00
R. Ryantm
160094c9ec hydrus: 482 -> 483 2022-05-05 06:03:22 +00:00
github-actions[bot]
46944fe032
Merge staging-next into staging 2022-05-03 00:02:25 +00:00
Jan Tojnar
aae4fc3e87
Merge pull request #170653 from schuelermine/add/tesseract5
Add Tesseract 5 & update Tessdata to 4.1.0
2022-05-02 23:58:15 +02:00
Anselm Schüler
92a849e613
tesseract5: init at 5.1.0 2022-05-02 13:44:04 +02:00
Anselm Schüler
1b38ecfc74
tesseract4.tessdata: 4.0.0 -> 4.1.0 2022-05-02 13:44:03 +02:00
Erik Arvstedt
7d2cee008b
tesseract: add wrapper test 2022-05-02 13:44:03 +02:00
Erik Arvstedt
0532532835
tesseract: use multi-line build inputs format 2022-05-02 12:39:50 +02:00
Erik Arvstedt
683c50d805
tesseract: switch to SRI hash format 2022-05-02 12:39:49 +02:00
Erik Arvstedt
42b719a3be
tesseract: fix fetch-language-hashes
- Don't match spaces in language names
- Remove duplicate languages
2022-05-02 12:39:49 +02:00
Vladimír Čunát
9478ec747c
Merge branch 'staging-next-2022-04-23'
Close #169965: the PR and real 'staging-next' branch contained
extra systemd rebuild that I wanted to avoid in this iteration.
(to save Hydra's work)
2022-05-02 09:12:51 +02:00
github-actions[bot]
677697c12f
Merge staging-next into staging 2022-05-01 18:01:35 +00:00
github-actions[bot]
da9b549e31
Merge master into staging-next 2022-05-01 18:01:03 +00:00
Kerstin Humm
ab3a25bc8c
imagemagick: 7.1.0-31 -> 7.1.0-32 2022-05-01 12:13:18 +02:00
Vladimír Čunát
c480cc2895
Merge branch 'master' into staging-next-2022-04-23 2022-04-30 23:02:28 +02:00
github-actions[bot]
5f05f984a6
Merge staging-next into staging 2022-04-30 00:02:41 +00:00
github-actions[bot]
142bf917b0
Merge master into staging-next 2022-04-30 00:02:08 +00:00
Sandro
f308111faa
Merge pull request #164879 from willcohen/proj-9
proj: 8.2.1 -> 9.0.0
2022-04-30 01:44:39 +02:00
Will Cohen
aed4d163f6 cloudcompare: mark as broken on linux 2022-04-29 16:08:44 -04:00
github-actions[bot]
3624aa9760
Merge staging-next into staging 2022-04-29 18:01:55 +00:00
github-actions[bot]
db87306c53
Merge master into staging-next 2022-04-29 18:01:20 +00:00
R. Ryantm
cb3a58a603 ovito: 3.6.0 -> 3.7.1 2022-04-29 09:40:36 -05:00
github-actions[bot]
58538c1840
Merge staging-next into staging 2022-04-28 18:07:38 +00:00
Vladimír Čunát
84de05dba7
Merge branch 'master' into staging-next 2022-04-28 18:05:38 +02:00
Vladimír Čunát
8caa1418f6
Merge branch 'master' into staging-next-2022-04-23 2022-04-28 18:04:16 +02:00
Artturi
46661fa42e
Merge pull request #166318 from r-ryantm/auto-update/graphicsmagick 2022-04-28 16:49:00 +03:00
Vladimír Čunát
51554cbbdb
Merge branch 'master' into staging-next-2022-04-23 2022-04-27 22:50:17 +02:00
github-actions[bot]
2d8612d4c3
Merge staging-next into staging 2022-04-27 18:02:29 +00:00
github-actions[bot]
565df1946d
Merge master into staging-next 2022-04-27 18:01:19 +00:00
Sandro
e650789e6e
Merge pull request #169510 from reckenrode/darwin-sane
sane-backends: fix build on Darwin
2022-04-27 16:56:35 +02:00
github-actions[bot]
6a14b5834e
Merge master into staging-next 2022-04-25 00:02:35 +00:00
André Vitor de Lima Matos
5d7333150a digikam: 7.4.0 -> 7.6.0 2022-04-24 19:05:46 -03:00
André Vitor de Lima Matos
aee2d2511b skanpage: move into/use kde/gear distribution from 22.04 2022-04-24 19:05:44 -03:00
Rick van Schijndel
87d34a6b89
Merge pull request #169856 from samuelgrf/remove-samuelgrf-from-maintainers
treewide: remove samuelgrf from maintainers
2022-04-24 22:18:43 +02:00
github-actions[bot]
b9e4b22843
Merge master into staging-next 2022-04-24 12:01:14 +00:00
Robert Schütz
95aa9e3550 imagemagick: 7.1.0-30 -> 7.1.0-31 2022-04-24 13:10:01 +02:00
github-actions[bot]
93ca6b8345
Merge master into staging-next 2022-04-24 06:01:05 +00:00
Bobby Rong
9c0eb42247
Merge pull request #169313 from dbalan/darktable_add_glib-net
darktable: add glib-networking dependency
2022-04-24 10:44:16 +08:00
github-actions[bot]
696025ae9c
Merge master into staging-next 2022-04-24 00:02:26 +00:00
ajs124
30b665175c
Merge pull request #169732 from interruptinuse/rawtherapee-glibc-malloc
rawtherapee: Fix glibc-2.34 malloc build error
2022-04-23 22:27:25 +01:00
Vladimír Čunát
82ec893b68
Merge branch 'staging' into staging-next 2022-04-23 18:10:57 +02:00
Samuel Gräfenstein
0c890f5866
treewide: remove samuelgrf from maintainers 2022-04-22 23:21:58 +02:00
Artturi
785373a76f
Merge pull request #166605 from siraben/remove-redundant-stdenv 2022-04-22 20:25:38 +03:00
inty
3b0f9301bb rawtherapee: Add note about removing the patch in 5.9 2022-04-22 15:13:03 +00:00
Artturin
f1c7f19e49 treewide: testVersion -> testers.testVersion 2022-04-22 16:24:27 +03:00
inty
36b0854076 rawtherapee: Add glibc-2.34 malloc error patch
FOR MAINTAINERS: This patch will have to be removed once rawtherapee-5.9
is packaged.

Fixes the following rtengine.dir/myfile.cc.o build error:
<..>-glibc-2.34-115-dev/include/wchar.h:582:24: error: 'malloc' attribute argument 1 is ambiguous
  582 |   __attribute_malloc__ __attr_dealloc_fclose;

For the upstream discussion, see Beep6581/RawTherapee#6324.
2022-04-22 08:37:33 +00:00
Randy Eckenrode
f6999e0cc5
sane-backends: fix build on Darwin 2022-04-21 22:01:19 -04:00
Ryan Mulligan
659b91df0a
Merge pull request #169524 from r-ryantm/auto-update/hydrus
hydrus: 481 -> 482
2022-04-21 16:09:52 -07:00
Kerstin Humm
1200c1c3e0
imagemagick: 7.1.0-29 -> 7.1.0-30 2022-04-21 17:01:04 +02:00
Sandro
82d988b5c6
Merge pull request #165743 from barinov274/unigine-valley 2022-04-21 15:49:29 +02:00
R. Ryantm
36fa19fd69 hydrus: 481 -> 482 2022-04-21 04:28:21 +00:00
tilcreator
6efbfd12e7 inkscape: add pyserial 2022-04-20 04:39:59 +02:00
Dhananjay Balan
905fad4c4b darktable: add glib-networking dependency
This is needed for "mapping" functionality to work, which is broken in master.
2022-04-19 13:49:24 +02:00
barinov274
b7642726f9 unigine-valley: add desktop icon and change libGL to libglvnd 2022-04-19 19:30:27 +10:00
Lassulus
91771f3b50
Merge pull request #163031 from samuelgrf/gimpPlugins.bimp-init-at-2.6
gimpPlugins.bimp: init at 2.6
2022-04-18 22:03:50 +01:00
Ryan Mulligan
77e8614d07
Merge pull request #168875 from r-ryantm/auto-update/hydrus
hydrus: 480 -> 481
2022-04-18 06:30:39 -07:00
7c6f434c
891d0226de
Merge pull request #169119 from 7c6f434c/openscad-prebuild-parser
openscad: force-build the file causing dependency issues
2022-04-17 23:23:36 +00:00
Sandro
36b4622299
Merge pull request #168347 from hqurve/fix-openboard
openboard: fix compile with poppler >= 22.01
2022-04-18 00:58:26 +02:00
Michael Raskin
5926235381 openscad: force-build the file causing dependency issues 2022-04-18 00:47:00 +02:00
hqurve
b82b97e4d9 openboard: pin ffmpeg_4 and fix compile with poppler >= 22.01 2022-04-16 19:33:36 -04:00
Ben Siraphob
259fa13d53 treewide: remove nativeBuildInputs that are in stdenv 2022-04-16 21:46:46 +03:00
github-actions[bot]
6b9c75bed5
Merge master into staging-next 2022-04-16 18:01:07 +00:00
Kevin Cox
c8b84603f0
Merge pull request #167205 from pacien/gscan2pdf-2.12.6
gscan2pdf: 2.12.5 -> 2.12.6
2022-04-16 09:28:43 -04:00
R. Ryantm
6592797222 hydrus: 480 -> 481 2022-04-16 04:54:01 +00:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Bobby Rong
137c465510
Merge pull request #167657 from dali99/update_hydrus2
hydrus: 479 -> 480
2022-04-15 19:09:47 +08:00
github-actions[bot]
eef7dee538
Merge master into staging-next 2022-04-15 06:01:16 +00:00
Sandro
4aa11b21b5
Merge pull request #168455 from barinov274/sanctuary
unigine-sanctuary: init at 2.3
2022-04-15 04:22:15 +02:00
Martin Weinelt
33425fdc96
Merge pull request #166489 from NixOS/python-updates 2022-04-15 03:47:30 +02:00
Martin Weinelt
5ee7d17afc python3Packages.path: rename from path.py; 12.0.1 -> 16.4.0
The project had been renamed after 12.5.0 back in 2020, which is why we
didn't receive further updates.

Created an alias and renamed all existing references.
2022-04-15 01:39:54 +02:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Ryan Mulligan
b90aae9445
Merge pull request #168447 from r-ryantm/auto-update/geeqie
geeqie: 1.7.2 -> 1.7.3
2022-04-13 10:58:23 -07:00
barinov274
b0fd9be8a6 unigine-sanctuary: init at 2.3 2022-04-13 21:17:20 +10:00
R. Ryantm
306ca314d1 geeqie: 1.7.2 -> 1.7.3 2022-04-13 05:18:30 +00:00
DarkOnion0
7c4cc5125a drawio: 17.2.4 -> 17.4.2 2022-04-12 20:44:35 +02:00
Artturi
1aba4dff61
Merge pull request #167055 from tpwrules/upgrade-cloudcompare 2022-04-12 18:15:03 +03:00
Sandro
160258dee9
Merge pull request #167849 from barinov274/tropics 2022-04-11 10:55:51 +02:00
barinov274
e5ca3bbc0a unigine-tropics: init at 1.3 2022-04-11 16:35:41 +10:00
ajs124
513783a9fa
Merge pull request #166439 from erictapen/imagemagick
imagemagick: 7.1.0-26 -> 7.1.0-29, build with JXL for aarch64-linux
2022-04-10 22:05:20 +01:00
Vladimír Čunát
5e845236f2
Merge branch 'staging-next' into staging 2022-04-10 17:11:36 +02:00
R. Ryantm
ab3d8bd20d yed: 3.21.1 -> 3.22 2022-04-10 06:47:06 +00:00
Jan Tojnar
556edebe3c inkscape: Fix build with poppler 22.04 2022-04-09 00:39:42 +02:00
github-actions[bot]
a36cec68d4
Merge staging-next into staging 2022-04-08 12:02:01 +00:00
ajs124
01dee11f56
Merge pull request #167591 from jtojnar/mypaint
mypaint: Fix build
2022-04-08 13:28:50 +02:00
github-actions[bot]
62fec6748f
Merge staging-next into staging 2022-04-08 06:02:02 +00:00
Bobby Rong
feb6db0b5d
Merge pull request #167664 from bobby285271/drawing
drawing: fix build with meson 0.61
2022-04-08 13:20:02 +08:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
Bobby Rong
6911f1ef78
drawing: fix build with meson 0.61 2022-04-07 17:23:31 +08:00
Daniel Olsen
d36e02678b hydrus: 479 -> 480 2022-04-07 08:05:52 +02:00
Jan Tojnar
1de1469af8 mypaint: Fix build 2022-04-06 23:21:37 +02:00
Bobby Rong
6c79fb0c39
Merge pull request #166488 from dali99/update_hydrus2
hydrus: 478 -> 479
2022-04-06 22:14:48 +08:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
Vladimír Čunát
b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Bernardo Meurer
1b5e91c39b
Merge pull request #167279 from r-ryantm/auto-update/shotwell
shotwell: 0.30.14 -> 0.30.15
2022-04-05 10:13:24 -07:00
github-actions[bot]
3063a8ea39
Merge staging-next into staging 2022-04-05 12:10:46 +00:00
github-actions[bot]
27a4e52731
Merge master into staging-next 2022-04-05 12:05:41 +00:00
Rick van Schijndel
9f98b2bd7c
makeWrapper to nativeBuildInputs (#167225) 2022-04-05 10:34:48 +03:00
R. Ryantm
75dd95bdd7 shotwell: 0.30.14 -> 0.30.15 2022-04-05 05:24:57 +00:00
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
pacien
cb79cf47f7 gscan2pdf: 2.12.5 -> 2.12.6
Also re-enabling a no-longer failing test.
2022-04-04 19:06:29 +02:00
Martin Weinelt
c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
Doron Behar
08660ae7c5
Merge pull request #167075 from doronbehar/pkg/ocrfeeder 2022-04-04 15:21:13 +03:00
github-actions[bot]
17eb9da14b
Merge staging-next into staging 2022-04-04 12:06:26 +00:00
github-actions[bot]
ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
Bobby Rong
5a5e6548c4
Merge pull request #167097 from r-ryantm/auto-update/gthumb
gthumb: 3.12.1 -> 3.12.2
2022-04-04 18:25:40 +08:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
R. Ryantm
a59178d2eb gthumb: 3.12.1 -> 3.12.2 2022-04-03 22:37:01 +00:00
Doron Behar
84f98081dc ocrfeeder: Mark as broken due to upstream issue 2022-04-03 22:30:50 +03:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Thomas Watson
5f5a06877f CloudCompare: unstable-2021-10-14 -> 2.12.0, add plugins 2022-04-03 11:57:05 -05:00
ajs124
f75ec63a9b photivo: remove after being marked broken for over two years
It was marked in commit e186ad5c31 by worldofpeace on 2019-06-27 (commited on 2019-06-27)
2022-04-03 16:14:59 +01:00
github-actions[bot]
7c1912fb9a
Merge staging-next into staging 2022-04-03 12:01:53 +00:00
github-actions[bot]
90f8f24fca
Merge master into staging-next 2022-04-03 12:01:24 +00:00
Robert Schütz
fb1494f95a rnote: 0.3.5 -> 0.4.0
https://github.com/flxzt/rnote/releases/tag/v0.4.0
2022-04-03 06:28:04 +00:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
github-actions[bot]
66754ae952
Merge master into staging-next 2022-04-02 12:01:10 +00:00
Kerstin Humm
75e301c357 imagemagick6: remove erictapen as maintainer
I haven't looked at this package for a long time, so let's reflect that
fact in the maintainer field.
2022-04-02 12:45:11 +02:00
R. Ryantm
fd211d7aaa drawing: 0.8.5 -> 1.0.0 2022-04-02 12:11:15 +02:00
Doron Behar
2f7dda4450 ocrfeeder: 0.8.3 -> 0.8.5 2022-04-01 09:17:30 +03:00
github-actions[bot]
be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00
Ben Siraphob
61776f460f
treewide: remove stdenv from buildInputs 2022-03-31 11:19:30 -05:00
Bobby Rong
705a678726
Merge pull request #166406 from bobby285271/icon-library
icon-library: fix build with meson 0.61
2022-03-31 20:44:33 +08:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross
22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
Martin Weinelt
d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Daniel Olsen
03c128cc4b hydrus: 478 -> 479 2022-03-30 22:41:50 +02:00
Doron Behar
b61c4acec6
Merge pull request #166398 from bobby285271/drawing 2022-03-30 20:08:37 +03:00
Kerstin Humm
388d576fd1
imagemagick: 7.1.0-26 -> 7.1.0-29 2022-03-30 18:47:25 +02:00
Kerstin Humm
0cd7358869
imagemagick: use libjxl on aarch64-linux, as it builds now for that target
Works since f24cab5396
2022-03-30 18:47:25 +02:00
Bobby Rong
16608a048e
icon-library: use wrapGAppsHook4
This is a GTK4 application.
2022-03-30 19:18:32 +08:00
Bobby Rong
739e7ceeff
icon-library: fix build with meson 0.61 2022-03-30 19:17:17 +08:00
Peter Simons
7aaef4f836
Merge pull request #161548 from Stunkymonkey/sane-backend-phases
sane-backend: deprecate phases
2022-03-30 12:28:14 +02:00
Bobby Rong
d23a53bd36
drawing: fix build with meson 0.61 2022-03-30 18:09:51 +08:00
Felix Buehler
ff4d8134a2 sane-backend: deprecate phases 2022-03-30 10:14:47 +02:00
sternenseemann
d66b8dfa96 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-29 21:40:09 +02:00
R. Ryantm
fa06e9f42f graphicsmagick: 1.3.37 -> 1.3.38 2022-03-29 19:15:31 +00:00
R. Ryantm
1ab9577ed6 drawio: 17.2.1 -> 17.2.4 2022-03-29 12:18:27 +00:00
github-actions[bot]
36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
Martin Weinelt
d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
Matt Christ
c5fac1f611
brscan5: 1.2.7-0 -> 1.2.9.0 (#164903)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-27 13:43:16 +02:00
github-actions[bot]
ec92b288e2
Merge staging-next into staging 2022-03-27 06:01:57 +00:00
Martin Weinelt
7be28200e2 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 01:45:13 +01:00
Ben Siraphob
ed863440b8
Merge pull request #163924 from OPNA2608/fix/autoPatchelfHook_isLinux 2022-03-26 16:01:56 -05:00
Artturi
31747079c1
Merge pull request #165317 from fedeinthemix/xfig-icons 2022-03-26 21:39:28 +02:00
github-actions[bot]
77dc421883
Merge staging-next into staging 2022-03-26 18:01:56 +00:00
github-actions[bot]
3b6f03e497
Merge master into staging-next 2022-03-26 18:01:22 +00:00
Bobby Rong
8325c4b910
Merge pull request #165643 from dali99/update_hydrus2
hydrus: 477 -> 478
2022-03-26 22:31:07 +08:00
github-actions[bot]
b2fc63a844
Merge staging-next into staging 2022-03-26 12:02:50 +00:00
github-actions[bot]
811b90f085
Merge master into staging-next 2022-03-26 12:01:14 +00:00
barinov274
cc7594a705
unigine-superposition: init at 1.1 (#163820)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-26 12:02:27 +01:00
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Jan Tojnar
534a73511e inkscape: fix build with poppler 22.03 2022-03-25 19:02:30 +01:00
Jan Tojnar
2a3f38f305 gthumb: 3.12.0 → 3.12.1
https://gitlab.gnome.org/GNOME/gthumb/-/compare/3.12.0...3.12.1
2022-03-25 15:02:49 +01:00
Jan Tojnar
31a318d325 gnome-photos: 40.0 → 42.0
https://gitlab.gnome.org/GNOME/gnome-photos/-/compare/40.0...42.0
2022-03-25 15:02:46 +01:00
github-actions[bot]
8357b101a5
Merge staging-next into staging 2022-03-25 12:02:05 +00:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Ben Siraphob
1cf5591a99
Merge pull request #165303 from Stunkymonkey/treewide-pname-version-18 2022-03-24 22:55:34 -05:00