Robert Schütz
|
7ac689dd4b
|
Merge pull request #146261 from dotlambda/megapixels-1.4.2
megapixels: 1.4.0 -> 1.4.2
|
2021-11-23 00:11:42 -08:00 |
|
Robert Schütz
|
4d3d8e205c
|
Merge pull request #146908 from erictapen/imagemagick
imagemagick: 7.1.0-14 -> 7.1.0-15
|
2021-11-22 19:59:58 -08:00 |
|
github-actions[bot]
|
28641f51dc
|
Merge master into staging-next
|
2021-11-22 18:01:08 +00:00 |
|
Sandro
|
8ce6cb961d
|
Merge pull request #145571 from WolfangAukang/pixeluvo
|
2021-11-22 16:07:08 +01:00 |
|
github-actions[bot]
|
9e1911e222
|
Merge master into staging-next
|
2021-11-22 12:01:27 +00:00 |
|
Bobby Rong
|
14ca76d9d7
|
Merge pull request #144432 from r-ryantm/auto-update/lightburn
lightburn: 1.0.02 -> 1.0.04
|
2021-11-22 15:43:13 +08:00 |
|
Jonathan Ringer
|
09e494f4c2
|
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/applications/window-managers/sway/default.nix
|
2021-11-21 14:40:40 -08:00 |
|
github-actions[bot]
|
18ad263272
|
Merge master into staging-next
|
2021-11-21 18:01:07 +00:00 |
|
Kerstin Humm
|
d3c7e5801f
|
imagemagick: 7.1.0-14 -> 7.1.0-15
|
2021-11-21 18:35:38 +01:00 |
|
Sebastián Mancilla
|
bb898727ec
|
hdr-plus: fix build on darwin
|
2021-11-21 13:44:46 -03:00 |
|
Domen Kožar
|
c31567f63c
|
Merge pull request #146786 from veprbl/pr/qvge_darwin
qvge: enable on darwin
|
2021-11-21 16:28:45 +01:00 |
|
Sandro
|
07f29d2db2
|
Merge pull request #146829 from r-burns/isx86
|
2021-11-21 14:20:12 +01:00 |
|
github-actions[bot]
|
c68c4b3db8
|
Merge master into staging-next
|
2021-11-21 12:01:20 +00:00 |
|
Alexander Bantyev
|
df59fc80d0
|
Merge pull request #146683 from AleXoundOS/fluxus
fluxus: switch to racket_7_9
|
2021-11-21 11:33:21 +03:00 |
|
Ryan Burns
|
2175b157ac
|
treewide: refactor isi686 && isx86_64 -> isx86
|
2021-11-20 17:50:41 -08:00 |
|
github-actions[bot]
|
43d088886e
|
Merge master into staging-next
|
2021-11-21 00:01:46 +00:00 |
|
Robert Scott
|
a66592d763
|
gimpPlugins.fourier: fix build on clang
|
2021-11-20 16:58:04 -05:00 |
|
Thiago Kenji Okada
|
da8cf9b4ac
|
Merge pull request #146785 from bcdarwin/update-f3d
f3d: 1.1.0 -> 1.1.1
|
2021-11-20 18:30:45 -03:00 |
|
Dmitry Kalinkin
|
fedc3db7ba
|
qvge: don't use libsForQt5.mkDerivation
|
2021-11-20 15:00:14 -05:00 |
|
Dmitry Kalinkin
|
74cb07175b
|
qvge: enable on darwin
|
2021-11-20 15:00:13 -05:00 |
|
Ben Darwin
|
30632db50a
|
f3d: 1.1.0 -> 1.1.1
|
2021-11-20 13:46:22 -05:00 |
|
github-actions[bot]
|
f515d91189
|
Merge master into staging-next
|
2021-11-20 18:01:07 +00:00 |
|
Robert Scott
|
67c0df93ea
|
gimp: fix build on darwin
despite us currently having a gtk2 without `GDK_OSX_BIGSUR` defined,
gimp have gone and spelt it `GDK_OSX_BIG_SUR` so define this
manually anyway
|
2021-11-20 16:48:52 +00:00 |
|
Alexander Tomokhov
|
02ed0b2ca3
|
fluxus: switch to racket_7_9
|
2021-11-20 00:25:07 +03:00 |
|
Jonathan Ringer
|
6ede9cd761
|
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/applications/audio/hybridreverb2/default.nix
|
2021-11-19 08:44:33 -08:00 |
|
Tom Torsney-Weir
|
0254860766
|
imagej: fix crash with opening dialogs (#142841)
|
2021-11-19 13:23:36 +01:00 |
|
github-actions[bot]
|
9d44a614de
|
Merge master into staging-next
|
2021-11-19 12:01:09 +00:00 |
|
Daniel Olsen
|
f5f1288810
|
hydrus: 461 -> 462
|
2021-11-18 07:46:45 +01:00 |
|
github-actions[bot]
|
cf671bd5e9
|
Merge master into staging-next
|
2021-11-17 12:01:23 +00:00 |
|
github-actions[bot]
|
f8cf67790e
|
Merge master into staging-next
|
2021-11-17 06:01:28 +00:00 |
|
figsoda
|
009c51b5ae
|
menyoki: fix darwin build
|
2021-11-16 21:05:36 -05:00 |
|
figsoda
|
6ad04bcb7d
|
Merge pull request #146243 from figsoda/treewide-rust-feature
treewide: use buildFeatures and checkFeatures for rust packages
|
2021-11-16 21:00:48 -05:00 |
|
github-actions[bot]
|
90829d83e5
|
Merge master into staging-next
|
2021-11-17 00:01:49 +00:00 |
|
Kerstin Humm
|
4d5800ed10
|
imagemagick: 7.1.0-13 -> 7.1.0-14
|
2021-11-16 21:07:09 +01:00 |
|
Robert Schütz
|
5346a90b83
|
megapixels: 1.4.0 -> 1.4.2
|
2021-11-16 07:54:43 -08:00 |
|
figsoda
|
104fd24044
|
menyoki: use buildNoDefaultFeatures
|
2021-11-16 08:35:09 -05:00 |
|
github-actions[bot]
|
112c228b4b
|
Merge staging-next into staging
|
2021-11-16 06:01:37 +00:00 |
|
Mario Rodas
|
975624d954
|
Merge pull request #144272 from bcdarwin/update-c3d
c3d: unstable-2020-10-05 -> unstable-2021-09-14
|
2021-11-16 00:02:01 -05:00 |
|
github-actions[bot]
|
faf5da6aed
|
Merge staging-next into staging
|
2021-11-15 12:01:44 +00:00 |
|
Vladimír Čunát
|
64065d76f4
|
Merge #144730: branch 'staging-next'
|
2021-11-15 11:52:15 +01:00 |
|
Thiago Kenji Okada
|
1635352a5c
|
Merge pull request #145027 from vs49688/fiji
fiji: init at 20201104-1356
|
2021-11-14 21:41:41 -03:00 |
|
github-actions[bot]
|
9f6360b7fb
|
Merge staging-next into staging
|
2021-11-14 18:01:49 +00:00 |
|
github-actions[bot]
|
093d806878
|
Merge master into staging-next
|
2021-11-14 18:01:14 +00:00 |
|
Robert Schütz
|
a00398c163
|
Merge pull request #145851 from dotlambda/megapixels-1.4.0
megapixels: 1.3.0 -> 1.4.0
|
2021-11-14 08:19:31 -08:00 |
|
sternenseemann
|
987dd38788
|
Merge remote-tracking branch 'origin/master' into staging-next
|
2021-11-14 17:04:19 +01:00 |
|
Domen Kožar
|
439f14aa7e
|
Merge pull request #145654 from Artturin/tesseractupdate
tesseract4: apply patches to fix build on aarch64-darwin
|
2021-11-14 09:31:55 -06:00 |
|
Artturin
|
e50c9981d3
|
tesseract4: apply patches to fix build on aarch64-darwin
|
2021-11-14 16:21:22 +02:00 |
|
Robert Schütz
|
801fe64590
|
megapixels: 1.3.0 -> 1.4.0
|
2021-11-13 20:27:41 -08:00 |
|
Alyssa Ross
|
26b89bcd16
|
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
|
2021-11-13 15:30:01 +00:00 |
|
github-actions[bot]
|
631c3d7cb2
|
Merge master into staging-next
|
2021-11-13 12:01:13 +00:00 |
|