Commit Graph

3585 Commits

Author SHA1 Message Date
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
Thomas Gerbet
8647f1570f pqiv: use ffmpeg4
See migrate away from ffmpeg_3 #120705.
2021-05-08 19:49:11 -07:00
github-actions[bot]
6d46d8a9b9
Merge master into staging-next 2021-05-08 18:22:46 +00:00
Robert Hensing
8e3c5eb501 treewide: xvfb_run -> xvfb-run 2021-05-08 15:48:41 +02:00
Martin Weinelt
9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02:00
Vladimír Čunát
080cd658ca
Merge #121780: treewide meta.maintainers tweaks 2021-05-08 10:47:08 +02:00
Jan Tojnar
468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
github-actions[bot]
e21fb16f9a
Merge master into staging-next 2021-05-08 06:20:05 +00:00
Maciej Krüger
3f5b404980
Merge pull request #122065 from mkg20001/pick-update
pick-colour-picker: unstable-2019-10-11 -> unstable-2021-01-19
2021-05-08 06:50:49 +02:00
github-actions[bot]
b4416b52c5
Merge master into staging-next 2021-05-08 00:46:50 +00:00
Maciej Krüger
6fe87c0dff
pick-colour-picker: unstable-2019-10-11 -> unstable-2021-01-19 2021-05-07 22:08:25 +02:00
Jan Solanti
49d736450b renderdoc: 1.12 -> 1.13 2021-05-07 22:27:53 +03:00
Maximilian Bosch
fcd5670a07 emulsion: fix build
ZHF #122042
Failing Hydra build: https://hydra.nixos.org/build/142625836
2021-05-07 11:35:55 -07:00
github-actions[bot]
1ae6d3d02f
Merge master into staging-next 2021-05-07 18:24:29 +00:00
Vladimír Čunát
73e17a3594
treewide: remove lethalman from meta.maintainers
He hasn't been heard of for years.
2021-05-07 15:36:40 +02:00
Vladimír Čunát
9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
nicoo
4e80c9b383 solvespace: 3.0rc2 → 3.0 2021-05-07 15:07:08 +02:00
github-actions[bot]
12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
Jan Tojnar
9468b07326
Merge branch 'gnome-40' 2021-05-07 12:12:40 +02:00
Robert Hensing
aaec26af39
Merge pull request #121896 from raboof/extract-version-test-to-utility
test-utilities: version test
2021-05-07 11:56:01 +02:00
Arnout Engelen
b68130fd2c
test-utilities: version test
Extract 'version test' to a reusable test utility as discussed in
https://github.com/NixOS/nixpkgs/pull/119636#issuecomment-826137021 and
2021-05-07 09:53:35 +02:00
github-actions[bot]
b8cdb044e9
Merge staging-next into staging 2021-05-07 06:20:24 +00:00
Yusuf Bera Ertan
240b3cd5d3 pythonPackages.hydrus: 436 -> 438 2021-05-06 21:20:18 -07:00
Jan Tojnar
26e044b14a
imagemagick: Try to fix Darwin build 2021-05-05 22:43:09 +02:00
Jan Tojnar
58fce4e270
gimp: 2.10.22 → 2.10.24
https://www.gimp.org/news/2021/03/29/gimp-2-10-24-released/
2021-05-05 22:42:56 +02:00
Jan Tojnar
1a7ac9640a
inkscape: Fix build with glib 2.68 2021-05-05 22:42:54 +02:00
Jan Tojnar
f75ef6048d
gthumb: 3.10.2 → 3.11.3 2021-05-05 22:42:24 +02:00
Jan Tojnar
ec9e4c2840
gnome-photos: 3.38.0 → 40.0 2021-05-05 22:42:22 +02:00
Jan Tojnar
7d535edec5
gnome3: support new versioning scheme in the update script
https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235
2021-05-05 22:20:20 +02:00
github-actions[bot]
a4c3a2d732
Merge staging-next into staging 2021-05-03 12:26:48 +00:00
OPNA2608
a2c66faaba foxotron: Clarify license 2021-05-03 11:35:44 +02:00
OPNA2608
e1cda59ce3 foxotron: 2021-03-12 -> 2021-04-19 2021-05-03 11:15:22 +02:00
github-actions[bot]
a7e07bddd5
Merge staging-next into staging 2021-05-02 12:24:53 +00:00
Luke Granger-Brown
beca3d2c0b openboard: build with quazip 1.x 2021-05-02 02:25:15 +00:00
Luke Granger-Brown
eb5588f914 nomacs: support quazip 1.x 2021-05-02 01:18:50 +00:00
github-actions[bot]
b4766e97ee
Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Sandro
75a24a5bc9
Merge pull request #121170 from samuelgrf/add-mainProgram-to-packages 2021-04-30 01:20:37 +02:00
Samuel Gräfenstein
bbcb63c308
imagemagick7: add meta.mainProgram 2021-04-29 14:59:31 +02:00
R. RyanTM
922271cc19 imagemagick: 7.0.11-8 -> 7.0.11-9 2021-04-29 13:26:44 +02:00
github-actions[bot]
655989d7b3
Merge staging-next into staging 2021-04-28 00:15:29 +00:00
Pavol Rusnak
db5ba05ba4
Merge pull request #120902 from prusnak/kodelife
kodelife: 0.9.0.129 -> 0.9.8.143
2021-04-27 22:25:57 +02:00
Sandro
093c739573
Merge pull request #120706 from eduardosm/krita 2021-04-27 21:47:18 +02:00
github-actions[bot]
97889a52e1
Merge staging-next into staging 2021-04-27 18:14:28 +00:00
Pavol Rusnak
c5e8b0486a
kodelife: 0.9.0.129 -> 0.9.8.143 2021-04-27 19:56:26 +02:00
Sandro
d4ff61db89
Merge pull request #120651 from con-f-use/master
mcomix3: 2020-11-23 -> 2021-04-23
2021-04-27 15:25:27 +02:00
Eduardo Sánchez Muñoz
571a0de422 krita: fix license
Source code's readme says

> Krita as a whole is licensed under the GNU Public License, Version 3. Individual files may have a different, but compatible license.
2021-04-26 14:13:57 +02:00
github-actions[bot]
e30742adc3
Merge staging-next into staging 2021-04-26 12:06:35 +00:00
davidak
e190acea28
Merge pull request #120701 from fufexan/openboard
openboard: init at 1.6.1
2021-04-26 12:58:39 +02:00
Eduardo Sánchez Muñoz
111261cab9 krita: 4.4.2 -> 4.4.3 2021-04-26 11:34:44 +02:00
Mihai Fufezan
8a41a60773
openboard: update meta.description 2021-04-26 12:33:53 +03:00