Commit Graph

8359 Commits

Author SHA1 Message Date
github-actions[bot]
728281e1ea
Merge master into staging-next 2023-12-08 00:02:27 +00:00
Weijia Wang
d25fad2342
Merge pull request #262650 from rhendric/rhendric/maptool
maptool: fix JS (extract application JARs from package)
2023-12-08 00:39:22 +01:00
github-actions[bot]
40f2209184
Merge master into staging-next 2023-12-07 18:00:57 +00:00
Francesco Gazzetta
0415d505bb warzone2100: 4.4.0 -> 4.4.1 2023-12-07 15:37:53 +00:00
Weijia Wang
3561c828d7
Merge pull request #272614 from pbsds/use-splitversion
treewide: use lib.splitVersion
2023-12-07 13:39:43 +01:00
github-actions[bot]
860e5725bd
Merge master into staging-next 2023-12-07 12:01:24 +00:00
K900
a5f1eb02c4 path-of-building.data: 2.35.4 -> 2.35.5
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.4...v2.35.5
2023-12-07 11:54:05 +03:00
Peder Bergebakken Sundt
d030c6ebf0
Merge pull request #267556 from Luflosi/update/aaaaxy
aaaaxy: 1.4.72 -> 1.4.101
2023-12-07 09:11:32 +01:00
Peder Bergebakken Sundt
815143af0f treewide: use lib.splitVersion 2023-12-07 07:18:41 +01:00
Peder Bergebakken Sundt
4ad9a14088
Merge pull request #270262 from h7x4/pkgs-cleanup-stepmania
stepmania: 5.1.0-b2 -> 5.1.0-b2-unstable-2022-11-14, cleanup
2023-12-07 07:01:35 +01:00
github-actions[bot]
e72d04004e
Merge master into staging-next 2023-12-06 18:00:56 +00:00
K900
0a21dac151 path-of-building.data: 2.35.3 -> 2.35.4
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.3...v2.35.4
2023-12-06 20:11:17 +03:00
github-actions[bot]
f48be2ac66
Merge master into staging-next 2023-12-06 12:01:16 +00:00
K900
21d08552d4 path-of-building.data: 2.35.2 -> 2.35.3
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.35.2...v2.35.3
2023-12-06 11:44:30 +03:00
K900
030f4008ec path-of-building.data: 2.34.1 -> 2.35.2
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.34.1...v2.35.2
2023-12-06 09:59:49 +03:00
github-actions[bot]
035a649a67
Merge master into staging-next 2023-12-06 06:01:30 +00:00
Rick van Schijndel
ba75066821
Merge pull request #271362 from pbsds/rm-dead-patches
treewide: remove unreferenced patch files
2023-12-06 03:28:15 +01:00
Fabián Heredia Montiel
5b8deaceca Merge remote-tracking branch 'origin/master' into staging-next
Fixed conflict in pkgs/applications/graphics/krita/

krita: 5.1.5 -> 5.2.0
7a40fdc288
, and
treewide: use kde mirror everywhere, don't use pname in download urls
aa15f5066d
2023-12-04 17:44:17 -06:00
erebfaer
3f916c8d59 starsector: added missing build input 2023-12-04 05:55:46 +00:00
Weijia Wang
a9afefbe1b
Merge pull request #266053 from r-ryantm/auto-update/ultrastardx
ultrastardx: 2023.9.0 -> 2023.11.0
2023-12-04 02:33:02 +01:00
Lassulus
c8fe76d8e8
Merge pull request #271498 from souxd/update-zandronum
zandronum: 3.0.1 -> 3.1.0
2023-12-03 21:38:37 +01:00
K900
00639571f8
Merge pull request #271540 from SuperSandro2000/kde-mirror
treewide: use kde mirror everywhere
2023-12-03 10:39:25 +03:00
github-actions[bot]
d865fa4303
Merge master into staging-next 2023-12-03 00:02:21 +00:00
Rob Whitaker
c5df6668db runelite: fix GPU error (missing libGL.so.1) 2023-12-02 17:01:51 -05:00
Mario Rodas
4ca76f4fce
Merge pull request #271580 from kirillrdy/amoeba
amoeba: fix build
2023-12-02 16:13:46 -05:00
github-actions[bot]
5f8f8a1514
Merge master into staging-next 2023-12-02 18:00:52 +00:00
Sandro Jäckel
aa15f5066d
treewide: use kde mirror everywhere, don't use pname in download urls 2023-12-02 17:14:24 +01:00
Peder Bergebakken Sundt
8c32e92721
Merge pull request #261945 from devusb/chiaki4deck-update
chiaki4deck: 1.4.0 -> 1.4.1
2023-12-02 16:39:09 +01:00
Kirill Radzikhovskyy
853e3d5a36 amoeba: fix build 2023-12-02 15:43:31 +11:00
github-actions[bot]
5d5c0a00c7
Merge master into staging-next 2023-12-02 00:02:19 +00:00
R. Ryantm
d21afee8d0 openttd-jgrpp: 0.55.3 -> 0.56.0 2023-12-01 15:34:44 -08:00
souxd
5647d108b3 zandronum: 3.0.1 -> 3.1.0
Changes to be committed:
	modified:   pkgs/games/doom-ports/zandronum/add_gitinfo.patch
	modified:   pkgs/games/doom-ports/zandronum/default.nix
	modified:   pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch
	modified:   pkgs/games/doom-ports/zandronum/sqlite.nix
	modified:   pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
2023-12-01 14:45:09 -03:00
github-actions[bot]
9cca0e4288
Merge master into staging-next 2023-12-01 12:01:16 +00:00
Emily Trau
c4eee36553
Merge pull request #255703 from Ometic/badlion-client
badlion-client: init at 3.15.0
2023-12-01 21:39:27 +11:00
Emily Trau
8e3ef22b3e
Merge pull request #271305 from spacefault/osu-lazer
osu-lazer-bin: 2023.1114.1 -> 2023.1130.0
2023-12-01 21:12:42 +11:00
Weijia Wang
07183914f1
Merge pull request #257692 from telotortium/anki-sync-server
nixos/anki-sync-server: init
2023-12-01 08:30:36 +01:00
Vladimír Čunát
305cd929fd
Merge branch 'staging' into staging-next 2023-12-01 07:33:49 +01:00
Peder Bergebakken Sundt
f41aba3739 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
2023-12-01 06:11:20 +01:00
spacefault
602e624773
osu-lazer-bin: 2023.1114.1 -> 2023.1130.0
This commit updates osu-lazer-bin from version 2023.1114.1 to
2023.1130.0. The changelogs for this update can be viewed here:
https://github.com/ppy/osu/releases/tag/2023.1130.0
2023-11-30 16:12:34 -07:00
Dominique Martinet
f0f6c77781 nixos/tests/anki-sync-server: add anki sync test
Start anki-sync-server service and drive anki manually through its
python lib to test sync.
The anki python part isn't a stable API and might require freqent
rework, let's see if it holds up...
2023-11-30 17:25:27 +01:00
Luflosi
ed48ad7b25
teeworlds: fix meta.license
Replace stringy license with a list of all used licenses.

The original meta.license said that the license was BSD-style but this information has been outdated for a long time.
The license was changed in 2008: bc108df382 (diff-7bb54d15ef4c4e0f20bb24add68a12fccced9925b304eaa696023143d278ea26).
The current license is clearly the zlib license and below that some notes about the licenses of `datasrc` (and `data`, which has not existed in the tree for many years), the fonts in `datasrc` and the libraries in `src/engine/external`.
See https://github.com/teeworlds/teeworlds/blob/master/license.txt for the current version of the license.
The meta.license string has been unchanged since the commit adding teeworlds in 2009: e71dbdbb83.

See issue #269788.
2023-11-30 10:52:26 +01:00
Dominique Martinet
c305510073 anki-sync-server: init at 2.1.66
anki-sync-server will be used in new ankisyncd module.

anki itself was slightly modified to add its cargoLock as passthru so we
can use it for anki-sync-server as it's built from the same sources.

Link: https://github.com/NixOS/nixpkgs/pull/257692
Co-authored-by: Pavel Sobolev <paveloom@riseup.net>
Co-authored-by: h7x4 <h7x4@nani.wtf>
2023-11-30 05:06:49 +01:00
Weijia Wang
27ed44cff1
Merge pull request #264796 from paveloom/anki
anki: 2.1.66 -> 23.10.1
2023-11-30 03:25:16 +01:00
Weijia Wang
b26d5828d5
Merge pull request #270905 from Luflosi/fix-teeworlds-on-darwin
teeworlds: fix build on Darwin
2023-11-30 00:08:05 +01:00
github-actions[bot]
e019e7cdb1
Merge staging-next into staging 2023-11-29 12:01:23 +00:00
Luflosi
db5b38723e
teeworlds-server: fix unbundling of wavpack dependency 2023-11-29 11:46:17 +01:00
Adam Joseph
db04185bc9 steam.runtime-wrapped: use throw, not abort 2023-11-29 09:44:43 +01:00
Pavel Sobolev
97933ba142
anki: 2.1.66 -> 23.10.1 2023-11-29 10:29:15 +03:00
Emily Trau
0e82926287
Merge pull request #268724 from cizra/mnemosyne
mnemosyne: 2.7.2 → 2.10.1
2023-11-29 17:43:08 +11:00
github-actions[bot]
e2e339af90
Merge staging-next into staging 2023-11-29 06:01:32 +00:00