Commit graph

8250 commits

Author SHA1 Message Date
Janik 340a3345a2
Merge pull request #268377 from r-ryantm/auto-update/fheroes2 2023-11-20 11:38:29 +01:00
Weijia Wang 789d57c5cf
Merge pull request #268219 from Samuel-Martineau/fix/moon-buggy
moon-buggy: add darwin compatibility
2023-11-20 07:34:46 +01:00
Mario Rodas eb796509e3
Merge pull request #267475 from stepbrobd/osu-lazer-bin
osu-lazer-bin: 2023.1026.0 -> 2023.1114.1
2023-11-19 07:50:04 -05:00
Jeremy 6fed70035d ddnet: 17.3 -> 17.4 2023-11-19 14:01:00 +13:00
R. Ryantm f64eedb509 fheroes2: 1.0.9 -> 1.0.10 2023-11-18 21:47:14 +00:00
Artturi 3a69df101e
Merge pull request #248321 from SuperSamus/itch 2023-11-18 23:36:00 +02:00
Samuel-Martineau de06161146
moon-buggy: add darwin compatibility 2023-11-18 11:18:54 -05:00
Weijia Wang 6769eec801 scummvm: fix build on darwin 2023-11-17 10:44:45 +01:00
Adam Joseph c7e0f6b905 treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
7c6f434c b7137a71c1
Merge pull request #267948 from uninsane/pr-animatch
animatch: init at 1.0.3
2023-11-17 06:05:29 +00:00
Colin 1284b39177 animatch: init at 1.0.3 2023-11-17 00:16:12 +00:00
Artturi 839563108f
Merge pull request #267957 from pbsds/nix-update-main-program 2023-11-17 00:36:48 +02:00
Vladimír Čunát a7a8f8253d
Merge #263535: staging-next 2023-10-26 2023-11-16 22:06:22 +01:00
Peder Bergebakken Sundt dc2ce0af94 nix-update: set meta.mainProgram 2023-11-16 21:42:13 +01:00
multiplealiases 00f0d34a6c the-powder-toy: only install .desktop on Linux 2023-11-16 19:11:18 +00:00
multiplealiases 0a2425dcff the-powder-toy: unstable-2022-08-30 -> 97.0.352
add new deps jsoncpp and libpng, also add mesonFlags
-Dworkaround_elusive_bzip2=false to prevent build failure.
powder.desktop is now generated inside the build directory from a
template in ../resources/powder.template.desktop
2023-11-16 19:11:18 +00:00
Vladimír Čunát 0fe5300699
Merge branch 'master' into staging-next 2023-11-16 09:49:24 +01:00
Nick Cao 234af5264d
Merge pull request #267599 from r-ryantm/auto-update/vassal
vassal: 3.7.4 -> 3.7.5
2023-11-15 09:23:18 -05:00
github-actions[bot] eba04b3485
Merge master into staging-next 2023-11-15 12:01:18 +00:00
Peder Bergebakken Sundt 229ee1db66
Merge pull request #267340 from a-n-n-a-l-e-e/rbdoom-3-fix-build
rbdoom-3-bfg: apply upstream patch; fix build
2023-11-15 12:26:43 +02:00
R. Ryantm 7765d62bc7 vassal: 3.7.4 -> 3.7.5 2023-11-15 06:12:21 +00:00
Yifei Sun ffa533f5d7
osu-lazer-bin: 2023.1026.0 -> 2023.1114.1 2023-11-14 10:46:01 -05:00
Martin Weinelt 3c336a1647
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/gdcm/default.nix
2023-11-14 13:16:34 +01:00
R. Ryantm 6fe1a0f6f6 sgt-puzzles: 20230918.2d9e414 -> 20231025.35f7965 2023-11-14 20:30:20 +11:00
Anna Lee 70ed962531
rbdoom-3-bfg: apply upstream patch; fix build
apply feffa4a4dd to fix shader compile error
2023-11-13 21:40:05 -08:00
Fabián Heredia Montiel 884449105e Merge remote-tracking branch 'origin/master' into staging-next 2023-11-13 14:31:51 -06:00
Peder Bergebakken Sundt db86bc5c4e
Merge pull request #267112 from amarshall/steam-run-mainprogram
steam-run: Set meta.mainProgram
2023-11-13 01:47:18 +02:00
Andrew Marshall fe94af355c steam-run: Set meta.mainProgram
Otherwise it is inheriting "steam" from `steam.meta`.
2023-11-12 16:56:38 -05:00
Weijia Wang c1eb661271 Merge branch 'master' into staging-next 2023-11-12 22:13:26 +01:00
Anderson Torres f8bd787134 brogue-ce: add AndersonTorres as maintainer
Because I am already a mantainer for Brogue Classic.
2023-11-12 21:17:24 +01:00
Anderson Torres bcec59d388 brogue: adopted by AndersonTorres and fgaz 2023-11-12 21:17:24 +01:00
Artturi 7bb5c7ae05
Merge pull request #266154 from sersorrel/xivlauncher-meta 2023-11-12 22:15:11 +02:00
Weijia Wang 74d102ce50 Merge branch 'master' into staging-next 2023-11-12 19:45:20 +01:00
Weijia Wang bb5d5ff4c3
Merge pull request #263836 from auxves/raylib-macos
raylib: support macOS
2023-11-12 19:16:23 +01:00
github-actions[bot] 33248a2caf
Merge master into staging-next 2023-11-12 00:02:14 +00:00
Francesco Gazzetta 703b9db6c5 hikounomizu: 1.0 -> 1.0.1 2023-11-11 19:53:55 +00:00
Francesco Gazzetta 65410694e2 warzone2100: 4.3.5 -> 4.4.0 2023-11-11 19:50:29 +00:00
Francesco Gazzetta db7401360a maintainers: remove skeidel
* Has been inactive for over 3 years
  https://github.com/svenkeidel?tab=overview&from=2020-12-01&to=2020-12-31&org=NixOS
* Is not responsive
  https://github.com/NixOS/nixpkgs/pull/249917
2023-11-11 19:28:45 +00:00
github-actions[bot] 9776723357
Merge master into staging-next 2023-11-11 18:00:58 +00:00
Anthony Roussel e30f48be94
treewide: fix redirected and broken URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2023-11-11 10:49:01 +01:00
github-actions[bot] 912311b7fd
Merge master into staging-next 2023-11-11 00:02:21 +00:00
Mahmoud Ayman 6465bb8af2
maintainers: remove atemu 2023-11-10 17:27:13 +02:00
Alyssa Ross afabc4a15d
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
	pkgs/development/libraries/SDL2/default.nix
2023-11-10 15:18:19 +01:00
Mahmoud Ayman 41589dfbac
anki-bin: 23.10 -> 23.10.1 2023-11-10 14:24:30 +02:00
OTABI Tomoya c894ab17c0
Merge pull request #266057 from r-ryantm/auto-update/yquake2
yquake2: 8.20 -> 8.30
2023-11-10 17:56:04 +09:00
github-actions[bot] e112f9b8bb
Merge master into staging-next 2023-11-09 18:00:56 +00:00
Rick van Schijndel 5bfa967f04
Merge pull request #254634 from majiru/update-runelite
runelite: 2.5.0 -> 2.6.9, build jar from source
2023-11-09 18:44:37 +01:00
Jacob Moody b4fc3f72d9 runelite: add updateScript 2023-11-09 08:44:34 -06:00
github-actions[bot] 2d73797da4
Merge master into staging-next 2023-11-09 12:01:04 +00:00
Kirill Radzikhovskyy 51ea6bf33c flightgear: remove unnecessary desktop item
Upstream already provides a (better) desktop file.
2023-11-09 08:36:13 +01:00