1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 03:25:02 +00:00
Commit graph

3612 commits

Author SHA1 Message Date
Vladimír Čunát 7cefeafb11
Merge #122934: krita: add breeze-icons 2021-05-19 09:17:58 +02:00
Anderson Torres de83b9baff
Merge pull request #122712 from AndersonTorres/adoption
Adoption of some packages from worldofpeace
2021-05-18 12:52:13 -03:00
AndersonTorres ac31cfa66b fondo: adoption 2021-05-18 11:12:32 -03:00
Jan Tojnar c007fb4026
gimpPlugins.pluginDerivation: Fix name
The name should not contain the gimp version, otherwise parseDrvName will consider it the gimp package.

Fixes: https://github.com/NixOS/nixpkgs/issues/114995
2021-05-17 23:47:27 +02:00
R. RyanTM b0b023a940 emulsion: 8.0 -> 9.0 2021-05-17 13:48:02 -07:00
R. RyanTM 1f79b3e79b avocode: 4.12.0 -> 4.14.0 2021-05-17 11:50:21 -07:00
Sandro 700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Francesco Gazzetta 6e80cf8238
meme: rename to meme-image-generator, unstable-2020-05-28 -> 1.0.1 (#120079) 2021-05-17 02:33:18 +02:00
Robert Schütz 333994ca6a
Merge pull request #123227 from erictapen/imagemagick-6.9.12-12
imagemagick6: 6.9.12.8 -> 6.9.12-12
2021-05-16 22:27:55 +02:00
github-actions[bot] 8c6d819143
Merge master into staging-next 2021-05-16 18:32:41 +00:00
Domen Kožar e20c5753f4
Merge pull request #123238 from stephank/fix-jpeg-archive-darwin
jpeg-archive: fix darwin build
2021-05-16 20:17:04 +02:00
Anderson Torres cf45c45605
Merge pull request #121588 from eduardosm/sip-rename
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
Stéphan Kochen eb8890f3bb jpeg-archive: fix darwin build 2021-05-16 13:56:30 +02:00
Kerstin Humm f1d61e1b4b
imagemagick6: 6.9.12.8 -> 6.9.12-12 2021-05-16 13:21:54 +02:00
Jonathan Ringer 0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Stéphan Kochen 006d7f80eb
imagemagick6: fix darwin build (#123023) 2021-05-14 16:21:38 -04:00
Evils df2eb33f06 krita: add breeze-icons
otherwise there are no icons available
2021-05-14 02:56:30 +02:00
github-actions[bot] 37c26a396b
Merge master into staging-next 2021-05-11 18:28:07 +00:00
Robert Schütz c9494b6fe0
megapixels: 0.16.0 -> 1.0.1 (#121722)
https://git.sr.ht/~martijnbraam/megapixels/refs/1.0.0
https://git.sr.ht/~martijnbraam/megapixels/refs/1.0.1
2021-05-11 20:07:20 +02:00
Anderson Torres dac4b0ad97
Merge pull request #122436 from peterhoeg/u/freecad_0_19_2
freecad: 0.19.1 -> 0.19.2
2021-05-11 10:42:58 -03:00
Eduardo Sánchez Muñoz 08a26e4579 pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
2021-05-10 20:41:38 +02:00
github-actions[bot] 61fa3fdde8
Merge master into staging-next 2021-05-10 18:28:17 +00:00
Peter Hoeg 77447c96ca freecad: 0.19.1 -> 0.19.2 2021-05-10 14:46:37 +08:00
github-actions[bot] 1e3d91bd19
Merge master into staging-next 2021-05-10 00:48:32 +00:00
pacien 13b226745a gscan2pdf: 2.11.1 -> 2.12.1 2021-05-10 00:45:11 +02:00
Robin Gloster 73e62029b9
feh: 3.6.3 -> 3.7 (#122375) 2021-05-09 21:44:39 +02:00
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