Commit Graph

4069 Commits

Author SHA1 Message Date
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
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Ellie Hermaszewska
dd8b662bf5
monado: build with libbsd
This is an optional dependency, the presence of which allows monado to
remove stale lock files.
2021-11-13 18:47:43 +08:00
ajs124
c696ab65ce
Merge pull request #145494 from DarkOnion0/master
drawio: 14.5.1 -> 15.7.3
2021-11-13 03:09:37 +01:00
github-actions[bot]
40a54af057
Merge staging-next into staging 2021-11-12 00:01:59 +00:00
github-actions[bot]
026e6c328a
Merge master into staging-next 2021-11-12 00:01:22 +00:00
Thiago Kenji Okada
91e7a04e7b
Merge pull request #145449 from dali99/update_hydrus2
hydrus: 460 -> 461
2021-11-11 19:28:51 -03:00
github-actions[bot]
a4e03b8977
Merge staging-next into staging 2021-11-11 18:01:50 +00:00
github-actions[bot]
f2d7271432
Merge master into staging-next 2021-11-11 18:01:13 +00:00
Zane van Iperen
7b25314c0a
fiji: init at 20201104-1356 2021-11-12 00:28:56 +10:00
DarkOnion0
e088d5b77b drawio: add darkonion0 as a maintainer 2021-11-11 15:00:01 +01:00
Sandro Jäckel
38a9cc1745
smartdeblur: switch to fetchFromGitHub, update meta 2021-11-11 14:46:17 +01:00
DarkOnion0
f0d19f93b7 drawio: 14.5.1 -> 15.7.3 2021-11-11 14:26:18 +01:00
Kerstin Humm
bb799694db
epoxy: rename to libepoxy
https://github.com/NixOS/nixpkgs/issues/145040
2021-11-11 05:55:32 +01:00
Daniel Olsen
873df62da2 hydrus: 460 -> 461 2021-11-11 04:04:30 +01:00
github-actions[bot]
b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Felix Bühler
f5c12e8311
treewide: replace '-git' packages with 'unstable-' in version (#145396) 2021-11-10 16:21:47 -05:00
github-actions[bot]
6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro Jäckel
e97c0f6281
sane: remove ? null from inputs, cleanup meta 2021-11-09 10:20:26 +01:00
Sandro Jäckel
9480c98ce1
gqview: remove outdated assert, cleanup meta 2021-11-09 10:20:11 +01:00
Sandro Jäckel
66b550c91a
gpicview: order attributes better 2021-11-09 10:19:55 +01:00
John Ericson
4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
Felix Bühler
fbdf78236a
pkgs/applications: rename name to pname&version part 1 (#144949)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-07 21:29:51 +01:00
github-actions[bot]
89ec09c858
Merge master into staging-next 2021-11-06 12:01:12 +00:00
Maciej Krüger
01e9eb40da
imgbrd-wrapper: 7.3.2 -> 7.5.1
ZHF: https://github.com/NixOS/nixpkgs/issues/144627
2021-11-05 04:47:31 +01:00
github-actions[bot]
ac4cb43546
Merge staging-next into staging 2021-11-05 00:02:01 +00:00
Sandro
cfefcfc460
Merge pull request #142380 from dan4ik605743/cubocore 2021-11-04 21:50:47 +01:00
github-actions[bot]
524db8975e
Merge staging-next into staging 2021-11-04 06:02:01 +00:00
Daniel Olsen
f64f106ff2 hydrus: 458 -> 460 2021-11-04 00:30:05 +01:00
github-actions[bot]
3567177949
Merge staging-next into staging 2021-11-03 18:10:58 +00:00
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
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