Commit graph

4523 commits

Author SHA1 Message Date
Artturin f1c7f19e49 treewide: testVersion -> testers.testVersion 2022-04-22 16:24:27 +03: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
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
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
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