Commit Graph

4177 Commits

Author SHA1 Message Date
Sandro
ca6d7c54c1
Merge pull request #144462 from Artturin/shutterupda 2021-11-03 17:05:10 +01:00
Artturin
a6a9160e64 shutter: 0.99 -> 0.99.2 2021-11-03 16:47:03 +02:00
R. Ryantm
97f6b2b238 lightburn: 1.0.02 -> 1.0.04 2021-11-03 12:18:41 +00:00
Bobby Rong
1c78751423
Merge pull request #144416 from bobby285271/mainprogram
treewide: set meta.mainProgram for packages teams.pantheon.members maintain
2021-11-03 20:10:33 +08:00
github-actions[bot]
bf39715fe0
Merge staging-next into staging 2021-11-03 12:01:58 +00:00
Bobby Rong
2483e778d4
treewide: set meta.mainProgram for packages teams.pantheon.members maintain 2021-11-03 19:07:21 +08:00
Shamrock Lee
3c77e75d14 graphicsmagick: add mainProgram 2021-11-03 18:05:49 +08:00
Ben Darwin
a21e52fe8b c3d: unstable-2020-10-05 -> unstable-2021-09-14 2021-11-02 15:41:30 -04:00
figsoda
f0fdb5489c
Merge pull request #143713 from figsoda/update-epick
epick: 0.5.1 -> 0.6.0
2021-11-02 12:28:20 -04:00
figsoda
52a9acab7c menyoki: 1.5.3 -> 1.5.5 2021-11-02 08:36:34 -04:00
figsoda
f7586b23f9 epick: 0.5.1 -> 0.6.0 2021-11-02 08:35:13 -04:00
github-actions[bot]
cc41bb5851
Merge master into staging-next 2021-11-01 12:01:00 +00:00
Pavol Rusnak
9989591b32
monado: fix build failure related to VK_NULL_HANDLE change 2021-11-01 10:37:49 +01:00
Artturi
1a0282c0ad
Merge pull request #144053 from legendofmiracles/update/weylus
weylus: 0.11.3 -> 0.11.4
2021-11-01 10:32:59 +02:00
github-actions[bot]
7eaf56d92e
Merge master into staging-next 2021-11-01 00:01:32 +00:00
R. Ryantm
714db3b557 qimgv: 1.0.1 -> 1.0.2 2021-10-31 16:28:47 -07:00
legendofmiracles
11a1d227b2
weylus: 0.11.3 -> 0.11.4 2021-10-31 17:16:53 -06:00
github-actions[bot]
7ca1d48ff2
Merge master into staging-next 2021-10-31 18:01:01 +00:00
Sandro
ba9b81a28e
Merge pull request #143338 from erictapen/imagemagick-7.1.0-12 2021-10-31 14:04:01 +01:00
Kerstin Humm
b90d3b02a3
imagemagick: 7.1.0-11 -> 7.1.0-13 2021-10-31 13:22:02 +01:00
github-actions[bot]
e4e8cd182e
Merge master into staging-next 2021-10-31 06:01:06 +00:00
Ryan Burns
2deb8d6e71
Merge pull request #143918 from legendofmiracles/update/weylus
weylus: 0.11.2 -> 0.11.3
2021-10-30 20:07:56 -07:00
legendofmiracles
446789875d
weylus: 0.11.2 -> 0.11.3 2021-10-30 18:48:53 -06:00
github-actions[bot]
97b60b1800
Merge master into staging-next 2021-10-29 12:01:19 +00:00
Sandro
e4f0ad260a
Merge pull request #143560 from r-ryantm/auto-update/sane-airscan 2021-10-29 11:48:09 +02:00
github-actions[bot]
e7fbce41fc
Merge master into staging-next 2021-10-29 06:01:10 +00:00
R. Ryantm
0342aee969 sane-airscan: 0.99.26 -> 0.99.27 2021-10-29 04:55:41 +00:00
Jan Tojnar
9a6f220ab9 inkscape: 1.0 → 1.1.1
https://gitlab.com/inkscape/inkscape/-/tags/INKSCAPE_1_1_1
https://wiki.inkscape.org/wiki/index.php/Release_notes/1.1.1
2021-10-29 04:54:53 +02:00
github-actions[bot]
22401dcc39
Merge master into staging-next 2021-10-27 18:01:02 +00:00
rowanG077
a64b27c5f3 cloudcompare: Cleanup/fix comments 2021-10-27 23:16:50 +09:00
github-actions[bot]
6bb6e64046
Merge master into staging-next 2021-10-26 12:01:25 +00:00
Sandro
f112b512e1
Merge pull request #142853 from erictapen/imagemagick-7.1.0-11 2021-10-26 13:17:51 +02:00
Sandro
e575fe69d5
Merge pull request #142852 from erictapen/imagemagick-6.9.12-26 2021-10-26 13:16:45 +02:00
github-actions[bot]
7e0da80ec9
Merge master into staging-next 2021-10-26 06:01:02 +00:00
rowanG077
dcf4f16669 cloudcompare: 2.11.2 -> unstable-2021-10-14
Released version doesn't work with packaged PCL
because it's too new. Considering that a release
is a year ago it's unreasonable to wait for it.
2021-10-26 09:58:06 +09:00
Kerstin Humm
8705d0826f
imagemagick6: 6.9.12-19 -> 6.9.12-26 2021-10-25 14:14:25 +02:00
Kerstin Humm
e7808cafea
imagemagick: 7.1.0-9 -> 7.1.0-11 2021-10-25 14:10:28 +02:00
github-actions[bot]
e84dc8ac6b
Merge master into staging-next 2021-10-24 12:01:27 +00:00
Jan Tojnar
e83a6a94fa
Merge pull request #142731 from jtojnar/more-gnome
More GNOME updates
2021-10-24 13:17:19 +02:00
Jan Tojnar
522e29d09e shotwell.updateScript: fix version policy 2021-10-24 12:38:18 +02:00
Bobby Rong
da675ab0ef
Merge pull request #141935 from sky1e/krita-beta
krita-beta: 5.0.0-beta1 -> 5.0.0-beta2
2021-10-24 17:34:35 +08:00
github-actions[bot]
d9e518d0a3
Merge master into staging-next 2021-10-23 12:01:22 +00:00
Maximilian Bosch
9e369dbdc8
Merge pull request #138410 from jtojnar/gimp-2.10.28
gimp: 2.10.24 → 2.10.28
2021-10-23 12:52:07 +02:00
Jonathan Ringer
fc25d94010
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
2021-10-22 09:33:07 -07:00
Anderson Torres
1cab3e231b
Merge pull request #141680 from AndersonTorres/new-ciano
ciano: init at 0.2.4
2021-10-22 13:15:41 -03:00
github-actions[bot]
872437b0f0
Merge master into staging-next 2021-10-21 00:01:47 +00:00
dan4ik
c33e391712 CuboCore.packages: added 2021-10-20 22:35:34 +07:00
figsoda
bda0cc3b1a image-roll: init at 1.3.1
Co-authored-by: Artturi <Artturin@artturin.com>
2021-10-20 08:38:56 -04:00
github-actions[bot]
cdc8393c04
Merge master into staging-next 2021-10-20 12:01:31 +00:00
Yannik Rödel
1c9842fa81
ipe: add desktop file (#141879)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-20 13:01:54 +02:00
Vladimír Čunát
01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
figsoda
8e6bf0688e epick: init at 0.5.1 2021-10-17 23:32:03 -04:00
AndersonTorres
33bbcacaf4 ciano: init at 0.2.4 2021-10-16 23:41:34 -03:00
Skye
61e4607143 krita-beta: 5.0.0-beta1 -> 5.0.0-beta2 2021-10-16 21:27:29 -04:00
Martin Weinelt
a415d5dd2e Merge remote-tracking branch 'origin/master' into staging-next 2021-10-15 23:10:08 +02:00
Jan Tojnar
690d9ab908
Merge pull request #141693 from jtojnar/gnome-stragglers
GNOME: more updates
2021-10-15 20:28:40 +02:00
Bernardo Meurer
001f61426c
Merge pull request #141605 from lovesegfault/shotwell-0.30.14
shotwell: 0.31.3 -> 0.30.14
2021-10-14 17:55:29 -07:00
Jan Tojnar
9ed32d8d85 gthumb: 3.11.4 → 3.12.0 2021-10-15 02:38:22 +02:00
Martin Weinelt
adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
Luke Granger-Brown
f584ae3750
Merge pull request #131526 from ckiee/kaldi
dragonfly: init at 0.32.0
2021-10-14 15:07:00 +01:00
Peter Simons
476635afe1 Drop myself from meta.maintainers for most packages.
I'd like to reduce the number of Github notifications and
review requests I receive.
2021-10-14 11:01:27 +02:00
Bernardo Meurer
b7451b5d6e
shotwell: 0.31.3 -> 0.30.14 2021-10-13 23:11:54 -07:00
Ryan Burns
808798f80c
Merge pull request #141566 from dali99/update_hydrus2
hydrus: 457 -> 458
2021-10-13 21:20:35 -07:00
Matt Votava
01478aefb3 drawing: 0.8.0 -> 0.8.3 2021-10-13 16:48:43 -07:00
Daniel Olsen
8827abe7d0 hydrus: 457 -> 458 2021-10-13 22:28:57 +02:00
github-actions[bot]
e69f5a133f
Merge staging-next into staging 2021-10-13 00:02:00 +00:00
Sandro
88c12f692c
Merge pull request #141304 from j0hax/imagemagick-libraw 2021-10-12 20:16:57 +02:00
Johannes Arnold
7662f6dd21 imagemagick: build with libraw 2021-10-12 02:23:01 +02:00
github-actions[bot]
5065827878
Merge staging-next into staging 2021-10-12 00:02:05 +00:00
Skye Jensen
cd78f8e761
krita: 4.4.7 -> 4.4.8; krita-beta: init at 5.0.0-beta1 (#139476) 2021-10-12 01:39:38 +02:00
github-actions[bot]
605eb4e1e0
Merge staging-next into staging 2021-10-08 18:01:58 +00:00
github-actions[bot]
b4569f7a81
Merge staging-next into staging 2021-10-08 00:02:10 +00:00
Jan Solanti
098d3a83a5 renderdoc: 1.15 -> 1.16 2021-10-08 01:10:12 +03:00
Daniel Olsen
da49981f02 hydrus: 456 -> 457 2021-10-07 01:18:54 +02:00
github-actions[bot]
3edaee3ccf
Merge staging-next into staging 2021-10-06 18:01:58 +00:00
Jan Tojnar
2b69ba1ead
Merge pull request #140067 from jtojnar/gscan2pdf
gscan2pdf: 2.12.1 → 2.12.3
2021-10-06 14:44:44 +02:00
github-actions[bot]
32615f6f8c
Merge staging-next into staging 2021-10-06 06:01:40 +00:00
AndersonTorres
9b2a54f7d6 treewide: change 0.0.0 to 0.pre in version attrs 2021-10-05 22:45:24 -03:00
github-actions[bot]
f4ec0a418f
Merge staging-next into staging 2021-10-05 18:01:58 +00:00
Kerstin Humm
075c492243
imagemagick: 7.1.0-8 -> 7.1.0-9 2021-10-05 18:02:08 +02:00
github-actions[bot]
8aab9796f3
Merge staging-next into staging 2021-10-03 06:01:55 +00:00
github-actions[bot]
a484ea4131
Merge master into staging-next 2021-10-03 06:01:22 +00:00
Sandro
d3ecd33d9c
Merge pull request #140204 from dali99/update_hydrus2 2021-10-03 04:43:45 +02:00
github-actions[bot]
91e467c213
Merge staging-next into staging 2021-10-03 00:02:41 +00:00
github-actions[bot]
a0d8ed46f8
Merge master into staging-next 2021-10-03 00:01:59 +00:00
Francesco Gazzetta
b2092aae6f drawpile: 2.1.19 -> 2.1.20 2021-10-02 17:50:36 +02:00
Daniel Olsen
f05c5e07e1 hydrus: 454 -> 456 2021-10-02 14:18:39 +02:00
github-actions[bot]
b38a46cddd
Merge staging-next into staging 2021-10-02 00:06:56 +00:00
Rick van Schijndel
224019bd1c imagemagick: unbreak for aarch64
With the newly added libjxl dependency it was broken, since libjxl
doesn't build on aarch64. Remove that dependency if we're building for
aarch64 for now, until the compiler / library is fixed.
2021-10-01 21:50:53 +02:00
Jan Tojnar
6f7ab306ef gscan2pdf: 2.12.1 → 2.12.3
https://sourceforge.net/p/gscan2pdf/mailman/message/37313105/
https://sourceforge.net/p/gscan2pdf/mailman/message/37353051/
2021-09-30 20:53:44 +02:00
github-actions[bot]
66bfbfb6b3
Merge staging-next into staging 2021-09-30 06:02:02 +00:00
github-actions[bot]
85e7bfc6c8
Merge master into staging-next 2021-09-30 06:01:26 +00:00
Artturi
fc9592cde3
Merge pull request #139970 from Artturin/photoflowmarkasbroken
photoflow: mark as broken
2021-09-30 03:44:22 +03:00
Artturin
8b1e139622 photoflow: mark as broken 2021-09-30 01:38:59 +03:00
github-actions[bot]
ce4a8ae240
Merge staging-next into staging 2021-09-29 18:01:44 +00:00
github-actions[bot]
19e8f1b28f
Merge master into staging-next 2021-09-29 18:01:07 +00:00
Daniel Nagy
1d95cc3392
qimgv: 0.9.1 -> 1.0.1 2021-09-29 15:43:36 +02:00
Sandro
7dd1625605
Merge pull request #139845 from trofi/fix-fbida-no-common 2021-09-29 10:24:53 +02:00
Sergei Trofimovich
7f30088485 fbida: pull upstream fix for -fno-common compiler 2021-09-29 07:59:00 +01:00
Dmitry Kalinkin
e0532475bc
treewide: remove darwin-only manual wrapQtApp invocations 2021-09-28 10:29:46 -04:00
github-actions[bot]
7bb1bfbf29
Merge master into staging-next 2021-09-27 06:01:12 +00:00
Maximilian Bosch
646cb17cdb
feh: 3.7.1 -> 3.7.2
ChangeLog: https://feh.finalrewind.org/archive/3.7.2/
2021-09-25 19:13:03 +02:00
github-actions[bot]
1cfb9e706e
Merge staging-next into staging 2021-09-25 00:02:02 +00:00
figsoda
140e9d8925
Merge pull request #135875 from r-ryantm/auto-update/mandelbulber
mandelbulber: 2.24 -> 2.26
2021-09-24 17:48:57 -04:00
Luflosi
241c3e0b3f imagemagick: add build option for JPEG XL image format 2021-09-24 12:08:34 +02:00
Robert Schütz
8cfc57a8e7
Merge pull request #138031 from erictapen/imagemagick-7.1.0-7
imagemagick: 7.1.0-6 -> 7.1.0-8
2021-09-23 09:48:25 -07:00
Kerstin Humm
279bff87fe imagemagick: 7.1.0-6 -> 7.1.0-8 2021-09-22 19:01:50 -07:00
Alyssa Ross
b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
Sandro
f18f2d87f3
Merge pull request #135284 from legendofmiracles/weylus 2021-09-21 22:04:38 +02:00
Alyssa Ross
e2bb7997c4
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	nixos/doc/manual/release-notes/rl-2111.section.md
2021-09-19 17:08:00 +00:00
Bobby Rong
0fd8cc3908
treewide: switch from pantheon.maintainers to lib.teams.pantheon 2021-09-18 23:07:00 +08:00
Jan Tojnar
8e2a0342dc gimp: 2.10.24 → 2.10.28
https://www.gimp.org/news/2021/09/18/gimp-2-10-28-released/
473b05ea3a/NEWS (L11)
2021-09-18 12:55:42 +02:00
github-actions[bot]
c4fd2a8f99
Merge master into staging-next 2021-09-18 00:01:33 +00:00
R. RyanTM
435c70c3f2 darktable: 3.6.0 -> 3.6.1 2021-09-16 06:28:36 +00:00
Bobby Rong
875df8d733
Merge pull request #137845 from r-ryantm/auto-update/lightburn
lightburn: 1.0.01 -> 1.0.02
2021-09-15 17:01:38 +08:00
github-actions[bot]
0f78d9c4b7
Merge staging-next into staging 2021-09-15 00:02:12 +00:00
github-actions[bot]
728f30ca03
Merge master into staging-next 2021-09-15 00:01:33 +00:00
Anderson Torres
601b81e132
Merge pull request #137638 from wentasah/freecad-libredwg
freecad: Allow opening .dwg files
2021-09-14 20:13:18 -03:00
Michal Sojka
5f191ca827 freecad: Allow opening .dwg files
Since version 0.19, freecad can open .dwg files through libredwg. See
https://wiki.freecadweb.org/FreeCAD_and_DWG_Import#FreeCAD_v0.19_and_LibreDWG.

Before this commit, freecad could open .dwg files only if libredwg was
independently installed. This is not how programs should work in Nix.
Therefore, we explicitly depend on libredwg and hardcode full path to
dwg2dxf.
2021-09-14 22:50:15 +02:00
github-actions[bot]
95f24a8a57
Merge staging-next into staging 2021-09-14 18:01:40 +00:00
github-actions[bot]
91c89490cc
Merge master into staging-next 2021-09-14 18:01:05 +00:00
R. RyanTM
ed8e4e6af2 lightburn: 1.0.01 -> 1.0.02 2021-09-14 15:50:28 +00:00
Bobby Rong
b4a5ca2a1e
Merge pull request #134973 from r-ryantm/auto-update/avocode
avocode: 4.15.0 -> 4.15.1
2021-09-14 22:51:33 +08:00
Sandro
2aa2ac8b9b
Merge pull request #137739 from r-ryantm/auto-update/shutter
shutter: 0.98 -> 0.99
2021-09-14 14:08:29 +02:00
R. RyanTM
f5276159d9 shutter: 0.98 -> 0.99 2021-09-14 04:14:01 +00:00
github-actions[bot]
79a728d821
Merge staging-next into staging 2021-09-14 00:01:57 +00:00
github-actions[bot]
1db0c42d5a
Merge master into staging-next 2021-09-14 00:01:23 +00:00
Ryan Mulligan
df7113c072
Merge pull request #135192 from r-ryantm/auto-update/lightburn
lightburn: 1.0.00 -> 1.0.01
2021-09-13 14:59:25 -07:00
github-actions[bot]
12eb8fbbba
Merge staging-next into staging 2021-09-13 06:02:09 +00:00
github-actions[bot]
d6f028d12d
Merge master into staging-next 2021-09-13 06:01:28 +00:00
Ryan Mulligan
85568eb45c
Merge pull request #134009 from r-ryantm/auto-update/yacreader
yacreader: 9.7.1 -> 9.8.2
2021-09-12 20:19:16 -07:00
github-actions[bot]
dfd1161f35
Merge staging-next into staging 2021-09-13 00:02:22 +00:00
github-actions[bot]
ac962ee61a
Merge master into staging-next 2021-09-13 00:01:41 +00:00
Sandro
668ea57f90
Merge pull request #136990 from erictapen/imagemagick-7.1.0.6 2021-09-12 22:23:16 +02:00
Tom Fitzhenry
607e389393 megapixels: 1.2.0 -> 1.3.0 2021-09-12 09:41:47 +10:00
github-actions[bot]
d370d9ee99
Merge staging-next into staging 2021-09-11 18:01:51 +00:00
github-actions[bot]
c435b0e35f
Merge master into staging-next 2021-09-11 18:01:16 +00:00
Sandro
ddd436dac7
Merge pull request #137230 from figsoda/menyoki 2021-09-11 16:56:25 +02:00
github-actions[bot]
6188f2aeeb
Merge staging-next into staging 2021-09-11 06:01:28 +00:00
Martin Weinelt
bae10ead99 Merge remote-tracking branch 'origin/master' into staging-next 2021-09-11 02:29:58 +02:00
Artturi
b72ad04a8a
Merge pull request #136509 from OPNA2608/fix/megapixels-schemas/21.11 2021-09-11 02:12:00 +03:00
Guillaume Girol
f0af291d64
Merge pull request #137219 from OPNA2608/update/foxotron/21.11
foxotron: 2021-04-19 -> 2021-08-13
2021-09-10 18:45:30 +00:00
figsoda
712f00a9a1 menyoki: init at 1.5.3 2021-09-10 08:23:39 -04:00
github-actions[bot]
43f3e1bcc6
Merge staging-next into staging 2021-09-10 00:02:06 +00:00
github-actions[bot]
912b8082df
Merge master into staging-next 2021-09-10 00:01:31 +00:00
OPNA2608
490081fcc1 foxotron: 2021-04-19 -> 2021-08-13 2021-09-09 21:21:21 +02:00
Kerstin Humm
3e0e70d1d3
imagemagick: 7.1.0-5 -> 7.1.0-6 2021-09-09 20:56:12 +02:00
Daniel Olsen
0ad75c87c9 hydrus: 452 -> 454 2021-09-09 00:20:21 +02:00
markuskowa
13bd2afb65
Merge pull request #136571 from markuskowa/fix-gfortran
treewide: move gfortran to nativeBuildInputs
2021-09-08 14:48:28 +02:00
Luke Granger-Brown
9094826af8 Merge remote-tracking branch 'upstream/staging-next' into staging-fix 2021-09-07 16:23:11 +00:00
github-actions[bot]
b6f0eb9136
Merge master into staging-next 2021-09-06 18:00:57 +00:00
Bobby Rong
526f87ebea
fondo: 1.5.2 -> 1.6.1 2021-09-06 22:39:47 +08:00
github-actions[bot]
75dc00dbd8
Merge master into staging-next 2021-09-05 18:00:57 +00:00
Martin Weinelt
7f732aca66 Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"
This reverts commit b041b2e1b2, reversing
changes made to 5b6c2380ad.
2021-09-05 15:02:25 +02:00
Martin Weinelt
b041b2e1b2 Merge remote-tracking branch 'origin/python-unstable' into staging-next 2021-09-05 14:51:26 +02:00
Martin Weinelt
c1065c53e5
Merge pull request #136364 from LeSuisse/fig2dev-3.2.8b
fig2dev: 3.2.8a -> 3.2.8b
2021-09-05 14:46:24 +02:00
Markus Kowalewski
30974110e3
freecad: move gfortran to nativeBuildInputs 2021-09-03 13:33:31 +02:00
OPNA2608
d3631d44ed megapixels: Fix schema compilation 2021-09-02 23:13:01 +02:00
github-actions[bot]
43fc404470
Merge staging-next into staging 2021-09-02 18:01:53 +00:00
github-actions[bot]
0630061ef3
Merge master into staging-next 2021-09-02 18:01:20 +00:00
Jan Tojnar
7d3c22094f
Merge pull request #136260 from svend/gthumb-3.114
gthumb: 3.11.3 -> 3.11.4
2021-09-02 15:44:14 +02:00
legendofmiracles
5258463721
nixos/weylus: init 2021-09-02 06:33:23 -06:00
github-actions[bot]
af292b1cdd
Merge staging-next into staging 2021-09-01 12:01:50 +00:00
github-actions[bot]
b2f58ca11e
Merge master into staging-next 2021-09-01 12:01:15 +00:00
LeSuisse
93ba1f2fee
xfig: 3.2.8a -> 3.2.8b (#136366)
b6c4fd32a1/
2021-09-01 07:19:09 -04:00
Thomas Gerbet
4cacbf4746 fig2dev: 3.2.8a -> 3.2.8b
This appears to fix a serie of buffer overflow.
8f11139e53/
2021-09-01 12:11:44 +02:00
Svend Sorensen
e02711df7d gthumb: 3.11.3 -> 3.11.4
Add `libheif` for AVIF/HEIF image support.
2021-08-30 19:59:19 -07:00
R. RyanTM
889e6328f5 mandelbulber: 2.24 -> 2.26 2021-08-27 08:07:07 +00:00
github-actions[bot]
1be90c9374
Merge staging-next into staging 2021-08-26 06:01:55 +00:00
Dmitry Kalinkin
262fd63a72
Merge branch 'master' into staging-next
Conflicts:
	pkgs/tools/networking/inetutils/default.nix
2021-08-26 00:57:08 -04:00
Martin Weinelt
4bbfad532b
Merge pull request #135720 from dali99/update_hydrus 2021-08-26 03:02:59 +02:00
Daniel Olsen
012009ec83 hydrus: hotfix release got forcepushed to same tag, updated hash 2021-08-26 02:04:15 +02:00
github-actions[bot]
1b3d772f68
Merge staging-next into staging 2021-08-26 00:02:19 +00:00
github-actions[bot]
1bf55a993f
Merge master into staging-next 2021-08-26 00:01:37 +00:00
Sandro
b6ef968f06
Merge pull request #135712 from dali99/update_hydrus 2021-08-26 01:20:10 +02:00
Daniel Olsen
c4960e2eed hydrus: 451 -> 452 2021-08-26 00:38:12 +02:00
Dmitry Kalinkin
bf2f228e25
Merge pull request #135303 from erictapen/imagemagick-7.1.0-5
imagemagick: 7.1.0-4 -> 7.1.0-5
2021-08-23 20:18:55 -04:00
ckie
ae9a55e65e
blockbench-electron: update maintainers 2021-08-24 01:15:45 +03:00
Jan Tojnar
4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
Jörg Thalheim
5d8e6ff956
meh: 2015-04-11 -> 2018-10-22 (#135299)
* meh: 2015-04-11 -> 2018-10-22

* Update pkgs/applications/graphics/meh/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-08-22 23:10:39 +02:00
Kerstin Humm
042229148d
imagemagick: 7.1.0-4 -> 7.1.0-5 2021-08-22 17:05:26 +02:00
legendofmiracles
f859b89525
weylus: init at 0.11.2 2021-08-22 07:46:51 -06:00
R. RyanTM
603adbcfce lightburn: 1.0.00 -> 1.0.01 2021-08-22 05:50:10 +00:00
Jan Tojnar
7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
toonn
4c654ddbc0
dosage: 2018.04.08 -> 2.17 (#132535)
* dosage: 2018.04.08 -> 2.17

I've assumed maintainership of the expression because there was none.
Using `fetchPypi` rather than `fetchFromGithub` because the Github tarballs
don't contain all the metadata necessary for the installation.

* dosage: Use pytestCheckHook rather than py.test

* dosage: Re-add test dependencies

* dosage: Add setuptools_scm build input

* dosage: Add six dependency
2021-08-21 15:04:25 +02:00
Sandro
b2573f352e
Merge pull request #134578 from smancill/phase-hooks-use-strings
treewide: ensure pre/post phase hooks are strings
2021-08-21 14:49:30 +02:00
Dmitry Kalinkin
9c0644262f
drawpile: remove unused fetchpatch input 2021-08-20 20:57:53 -04:00
Sebastián Mancilla
8f94a33b38 treewide: ensure pre/post phase hooks are strings
Some derivations use lib.optional or lib.optionals when setting pre/post
phase hooks. Ensure the proper lib.optionalString is used.
2021-08-20 19:08:42 -04:00
R. RyanTM
2e1d856625 avocode: 4.15.0 -> 4.15.1 2021-08-20 17:20:53 +00:00
davidak
be388e6435
Merge pull request #134961 from r-ryantm/auto-update/akira
akira-unstable: 0.0.15 -> 0.0.16
2021-08-20 17:37:57 +02:00
R. RyanTM
eb13cec281 akira-unstable: 0.0.15 -> 0.0.16 2021-08-20 15:15:27 +00:00
Sandro
8e68173b8a
Merge pull request #134737 from dali99/update_hydrus
hydrus: 450 -> 451
2021-08-19 19:49:20 +02:00
github-actions[bot]
323ea758dd
Merge staging-next into staging 2021-08-19 12:02:04 +00:00
Maximilian Bosch
0de79c608b
Merge pull request #133507 from Stunkymonkey/gimp-plugins
gimp-plugins: deprecate phases
2021-08-19 13:13:48 +02:00
Daniel Olsen
87098c66b8 hydrus: 450 -> 451 2021-08-19 00:43:43 +02:00
github-actions[bot]
cadf0193dd
Merge staging-next into staging 2021-08-18 18:01:40 +00:00
Niklas Hambüchen
bf8c2f2e8c
Merge pull request #134512 from nh2/netcdf-4.8.0
netcdf: 4.7.4 -> 4.8.0
2021-08-18 15:38:57 +02:00
github-actions[bot]
b6a825a9c7
Merge staging-next into staging 2021-08-18 06:02:10 +00:00
Ryan Mulligan
00cdbf6043
Merge pull request #134564 from r-ryantm/auto-update/shutter
shutter: 0.97 -> 0.98
2021-08-17 18:39:12 -07:00
github-actions[bot]
2341511023
Merge staging-next into staging 2021-08-18 00:01:59 +00:00