Commit Graph

4468 Commits

Author SHA1 Message Date
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +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
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
Doron Behar
b61c4acec6
Merge pull request #166398 from bobby285271/drawing 2022-03-30 20:08:37 +03: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
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