3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4486 commits

Author SHA1 Message Date
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
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
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
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
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
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