Commit graph

7976 commits

Author SHA1 Message Date
K900 a1649f366d path-of-building.data: 2.32.2 -> 2.33.0
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.32.2...v2.33.0
2023-08-25 07:00:47 +03:00
github-actions[bot] 4328391132
Merge master into staging-next 2023-08-24 12:01:05 +00:00
K900 242fc074e0
Merge pull request #251112 from K900/pob-2.32.2
path-of-building.data: 2.31.2 -> 2.32.2
2023-08-24 10:43:20 +03:00
K900 a2e77ba8ab path-of-building.data: 2.31.2 -> 2.32.2
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.31.2...v2.32.2
2023-08-24 10:34:44 +03:00
github-actions[bot] a451dcf514
Merge master into staging-next 2023-08-24 06:01:14 +00:00
Matthias Beyer 90f562fc12
Merge pull request #250858 from huantianad/r2modman-3143
r2modman: 3.1.42 -> 3.1.43
2023-08-24 07:56:20 +02:00
github-actions[bot] b179570bca
Merge master into staging-next 2023-08-23 06:01:21 +00:00
OTABI Tomoya 17759ba056
Merge pull request #250762 from r-ryantm/auto-update/ezquake
ezquake: 3.6.2 -> 3.6.3
2023-08-23 12:18:22 +09:00
OTABI Tomoya 6fc32915e5
Merge pull request #250842 from delroth/chiaki-2.2.0
chiaki: 2.1.1 -> 2.2.0
2023-08-23 11:29:30 +09:00
Nick Cao 1b210fb3e8
Merge pull request #250846 from TomaSajt/terraria-server
terraria-server: add meta.mainProgram and small refactor
2023-08-23 09:54:38 +08:00
huantian 6cb1d341ec
r2modman: 3.1.42 -> 3.1.43 2023-08-22 17:07:57 -07:00
TomaSajt b80c7a7358
terraria-server: add mainProgram and small refactor 2023-08-22 23:17:43 +02:00
Pierre Bourdon e4c982fd6d
chiaki: 2.1.1 -> 2.2.0 2023-08-22 23:10:12 +02:00
R. Ryantm c8e949e2af ezquake: 3.6.2 -> 3.6.3 2023-08-22 12:51:54 +00:00
seth 40a6e38aeb
prismlauncher: add canonicalize-jars-hook
this strips timestamps from java build artifacts, fixing reproducibility
issues
2023-08-22 08:28:16 -04:00
github-actions[bot] 602e1b2392
Merge staging-next into staging 2023-08-22 06:01:39 +00:00
Hugh O'Brien 4e17d86e81
corsix-th: 0.66 -> 0.67 2023-08-22 01:30:56 -04:00
Pol Dellaiera 8f508af8dc
urbanterror: fix configurePhase phase
Use `preConfigure` and external file instead.
2023-08-21 22:00:46 +02:00
Pol Dellaiera b2871a6ca8
ioquake3: fix preConfigure phase
Using `makeFlags` doesn't do anything, using the local `Makefile.local` is actually working.
2023-08-21 21:59:55 +02:00
github-actions[bot] 56f5b9fafc
Merge staging-next into staging 2023-08-21 12:01:35 +00:00
Naïm Favier 3eb1a985b2
Merge pull request #250526 from atemp/ddnet
ddnet: 17.1.1 -> 17.2.1
2023-08-21 13:56:05 +02:00
Pol Dellaiera b80ada5262
Merge pull request #250249 from NixOS/etlegacy/fix-and-refactor
etlegacy: fix and refactor
2023-08-21 12:42:37 +02:00
Heinz Deinhart 0eef983d34 ddnet: 17.1.1 -> 17.2.1
https://ddnet.org/downloads/#17.2
ddnet/ddnet@17.1.1...17.2.1
2023-08-21 12:15:13 +02:00
K900 1e42f77bd5 heroic: enable Wayland IME support
This doesn't crash anymore on the latest Electron and is useful for Steam Deck users.
2023-08-21 10:32:46 +03:00
Theodore Ni d494084017
Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
2023-08-20 20:09:45 -07:00
Pol Dellaiera 2836fd6fce
etlegacy: reformat files 2023-08-20 23:43:37 +02:00
Pol Dellaiera bc586df93d
etlegacy: add meta.longDescription 2023-08-20 23:43:18 +02:00
Pol Dellaiera d998c261cc
etlegacy: replace writeScriptBin with writeShellApplication 2023-08-20 23:42:49 +02:00
Pol Dellaiera 2e86fdebc6
Merge pull request #250216 from NixOS/urbanterror/cleanup
urbanterror: refactor, simplify, cleanup
2023-08-20 22:30:26 +02:00
figsoda 95d630c68d
Merge pull request #250357 from r-ryantm/auto-update/minesweep-rs
minesweep-rs: 6.0.19 -> 6.0.27
2023-08-20 15:02:07 -04:00
Pol Dellaiera 3c9d06797b
etlegacy: remove mainprogram attribute 2023-08-20 19:11:16 +02:00
Pol Dellaiera eab7a24373
etlegacy: disable fortify to have fully working binaries 2023-08-20 19:10:55 +02:00
Pol Dellaiera 1461c8fdd3
etlegacy: update cmakeFlags and change default install directories 2023-08-20 19:10:55 +02:00
Pol Dellaiera f07f9addb1
etlegacy: build server and client 2023-08-20 18:56:50 +02:00
Artturi bde196dde9
Merge pull request #245957 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing2 2023-08-20 18:57:05 +03:00
R. Ryantm 37ad14aab6 minesweep-rs: 6.0.19 -> 6.0.27 2023-08-20 13:44:18 +00:00
R. Ryantm c862dce860 angband: 4.2.4 -> 4.2.5 2023-08-20 12:50:50 +00:00
github-actions[bot] 435d3aef59
Merge staging-next into staging 2023-08-20 12:01:50 +00:00
Matthias Beyer 8ad234e7b8
Merge pull request #250126 from eclairevoyant/cutechess
cutechess: init at 1.3.1
2023-08-20 10:17:29 +02:00
K900 f410499cb1
Merge pull request #246288 from aidalgol/heroic-2.9
Update Heroic Games Launcher and dependencies
2023-08-20 09:43:34 +03:00
github-actions[bot] 8a62479e06
Merge staging-next into staging 2023-08-20 00:03:24 +00:00
Pol Dellaiera 9a0d0c1b50
etlegacy: refactor fetchAsset 2023-08-19 21:49:20 +02:00
Pol Dellaiera 918f740a67
etlegacy: reduce amount of local vars 2023-08-19 21:46:06 +02:00
Pol Dellaiera 81f84d95e4
etlegacy: add drupol as maintainer 2023-08-19 21:44:52 +02:00
Pol Dellaiera 51824a08f3
etlegacy: remove unused runCommand argument 2023-08-19 21:44:32 +02:00
Artturin b33de2708f grapejuice: use upstream installation script
https://gitlab.com/brinkervii/grapejuice/-/blob/master/src/grapejuice_packaging/builders/linux_package_builder.py
2023-08-19 22:03:20 +03:00
Pol Dellaiera e632e42b65
urbanterror: reformat nix file 2023-08-19 19:09:58 +02:00
Pol Dellaiera 588e5ae83a
urbanterror: refactor installPhase
Get some inspiration from OpenArena derivation
2023-08-19 19:09:34 +02:00
Pol Dellaiera 47db9561ff
urbanterror: update meta.homepage attribute, use https 2023-08-19 19:09:10 +02:00
Pol Dellaiera 52947c5a3e
urbanterror: add meta.mainProgram attribute 2023-08-19 19:05:13 +02:00
Pol Dellaiera ea53c4bd1b
urbanterror: add drupol as maintainer 2023-08-19 19:04:54 +02:00
Pol Dellaiera 199ba07f33
urbanterror: add desktop item 2023-08-19 17:41:11 +02:00
Pol Dellaiera 7082007e68
urbanterror: add missing phase hooks 2023-08-19 17:26:55 +02:00
TheBrainScrambler b3e3d4037d
ioquake3: fix incorrect license gpl2Only -> gpl2Plus 2023-08-19 17:04:04 +02:00
Pol Dellaiera 105e0258d0
openarena: fix desktop item desktopName attribute 2023-08-19 16:36:21 +02:00
github-actions[bot] bb1bf988bc
Merge staging-next into staging 2023-08-19 12:01:31 +00:00
Pol Dellaiera cac8909c85
Merge pull request #250100 from NixOS/ioquake3/update
ioquake3: fix missing `.so` files at startup and clean-up
2023-08-19 12:31:33 +02:00
Pol Dellaiera 88903dab0f
Merge pull request #250105 from NixOS/openarena/use-source
openarena: compile from sources
2023-08-19 12:29:39 +02:00
éclairevoyant 7d87be6c71
cutechess: init at 1.3.1 2023-08-19 04:05:58 -04:00
7c6f434c ef827b262c
Merge pull request #250096 from r-ryantm/auto-update/blobby
blobby: 1.1 -> 1.1.1
2023-08-19 07:06:14 +00:00
github-actions[bot] c9e2cfa3f4
Merge staging-next into staging 2023-08-19 06:01:31 +00:00
Theodore Ni 50a4d6349c
Merge pull request #250059 from tjni/anki
anki: remove pip from anki-build-python
2023-08-18 22:37:36 -07:00
Pol Dellaiera 758b6fa94b
openarena: compile from sources
- Add desktop item
- Use `finalAttrs` pattern
- Sort attributes and parameters naturally
- Update license
- Add `meta.mainProgram` attribute
- Add `drupol` as maintainer
2023-08-19 07:25:46 +02:00
Pol Dellaiera dbcc734bbd
ioquake3: cleanup
- Fix `ioquake3`
- Remove the arch suffix from the binaries (`ioquake3.x86-64` -> `ioquake3`, `ioq3ded.x86-64` -> `ioq3ded`)
- Add `.desktop` file
- Remove unneeded dependencies
- Clean-up installation phase
- Add `meta.mainProgram` attribute
- Add myself in the maintainer list
2023-08-19 07:06:15 +02:00
R. Ryantm 2076724c51 blobby: 1.1 -> 1.1.1 2023-08-19 04:05:13 +00:00
TheNexusAvenger dc340b8860 grapejuice: 7.8.3 -> 7.14.4
Update Grapejuice for easy release channel changing (mainly zintegration).
Changelogs: https://gitlab.com/brinkervii/grapejuice/-/tags

Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
2023-08-18 22:16:52 -04:00
Nick Cao 9783115b30
Merge pull request #249918 from fgaz/lbreakout2/fixes
lbreakout2: fix runtime issues
2023-08-19 09:00:43 +08:00
github-actions[bot] 313f7c5380
Merge staging-next into staging 2023-08-19 00:02:13 +00:00
Theodore Ni 6a89fda4de
anki: remove pip from anki-build-python 2023-08-18 16:37:20 -07:00
Theodore Ni ece0953571
Merge branch 'staging-next' into staging 2023-08-18 16:02:27 -07:00
Lily Foster 3effe8ee68
Merge pull request #177578 from Rotaerk/godot-mono
godot3: refactor, rename from godot, and add mono builds
2023-08-18 17:09:31 -04:00
Aidan Gauland f8fa19a5da
heroic: apply patch to fix Steam shortcuts 2023-08-19 08:06:17 +12:00
Francesco Gazzetta fe8acaa832 lbreakout2: fix runtime issues 2023-08-18 11:20:11 +02:00
Pol Dellaiera ed9af6d93e
Merge pull request #244855 from Tofixrs/master
atlauncher: 3.4.28.1 -> 3.4.30.0
2023-08-18 11:15:17 +02:00
tofixrs cba1a49c17 atlauncher: 3.4.28.1 -> 3.4.30.0 2023-08-18 10:03:18 +02:00
tofixrs bcbbd7deee atlauncher: add --no-launcher-update flag
Without the flag if there was an update the launcher wouldnt open.
2023-08-18 10:01:40 +02:00
R. Ryantm 8370543568 fheroes2: 1.0.6 -> 1.0.7 2023-08-18 03:53:34 +00:00
Jan Tojnar 86797b2008 Merge branch 'staging-next' into staging
Conflicts:
- pkgs/development/libraries/qt-6/default.nix
  Merge a5b92645f1 and 0597d865ef
2023-08-16 19:37:11 +02:00
Pol Dellaiera afa771cb32
Merge pull request #249494 from r-ryantm/auto-update/ferium
ferium: 4.4.0 -> 4.4.1
2023-08-16 17:07:46 +02:00
Thiago Kenji Okada 4186dae4eb
Merge pull request #249528 from meppu/osu-lazer
osu-lazer: 2023.811.0 -> 2023.815.0
2023-08-16 13:51:25 +00:00
meppu 4222fe5bcf
osu-lazer: 2023.811.0 -> 2023.815.0 2023-08-16 15:13:27 +03:00
meppu 23cb71d312
osu-lazer-bin: 2023.811.0 -> 2023.815.0 2023-08-16 15:13:18 +03:00
Pol Dellaiera 09dd1d6b7f
Merge pull request #208280 from jakubpawlowicz/fix/openxcom-update
openxcom: 1.0.0.2019.10.18 -> 1.0.0.2023.08.12
2023-08-16 12:05:50 +02:00
R. Ryantm b53c6f55d6 ferium: 4.4.0 -> 4.4.1 2023-08-16 09:09:27 +00:00
K900 94f0eeeb03 path-of-building.data: 2.31.1 -> 2.31.2
Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.31.1...v2.31.2
2023-08-16 11:11:36 +03:00
K900 6dca7c9e88 path-of-building: slight refactor to make automated updates work + cleanups 2023-08-16 11:10:02 +03:00
Nick Cao cd822b4978
Merge pull request #249012 from GiggleSquid/pkgs/vintagestory
vintagestory: 1.18.7 -> 1.18.8
2023-08-15 22:29:58 -06:00
Pol Dellaiera b120b97405
openxcom: minor cleanup
- sort lambda parameters
- remove obsolete `rec`
- sort `buildInputs`
- remove meta `with lib;`
2023-08-15 22:16:35 +02:00
Jakub Pawlowicz e53ffbdbee
openxcom: 1.0.0.2019.10.18 -> 1.0.0.2023.08.12
Updates openxcom to the latest version available.
2023-08-15 22:16:19 +02:00
K900 f5ffea29de
Merge pull request #248410 from K900/forge-mtg-1.6.57
forge-mtg: 1.6.56 -> 1.6.57
2023-08-15 22:29:35 +03:00
K900 574d11f231 path-of-building: 2.31.0 -> 2.31.1 2023-08-15 22:19:54 +03:00
K900 6edd6f71c7 treewide: clean up all qttranslations workarounds
There are two kinds of changes here:
- removing explicit qttranslations path hardcoding from applications that were patched to do it
- replacing qttranslations in buildInputs with qttools for packages that really depend on the latter

After this, qttranslation is never used outside Qt itself, as it should.
2023-08-15 22:11:39 +03:00
K900 2b50eb792a path-of-building: 2.30.1 -> 2.31.0 2023-08-14 21:29:31 +03:00
Jack Connors a50269d141
vintagestory: 1.18.7 -> 1.18.8
see: https://www.vintagestory.at/blog.html/news/v1188-net7-migration-completed-r363/
also removed mono/dotnet4 and experimental build since dotnet7 is now fully implimented
2023-08-14 03:36:32 +01:00
Adam Joseph cbc8aa437c treewide: use uncurried version of makeScopeWithSplicing 2023-08-14 02:51:10 +03:00
Weijia Wang 07c07dbbdc
Merge pull request #235879 from tomfitzhenry/minetest-server-aarch64
mindustry-server: enable on aarch64-linux
2023-08-14 00:07:21 +02:00
Weijia Wang 2d75e9b458
Merge pull request #248919 from r-ryantm/auto-update/unciv
unciv: 4.7.11 -> 4.7.13
2023-08-13 16:38:14 +02:00
Weijia Wang 572140539c
Merge pull request #248907 from TheBrainScrambler/fteqw
fteqw: unstable-2022-08-09 -> unstable-2023-08-03
2023-08-13 16:13:09 +02:00
R. Ryantm 0305a6950d unciv: 4.7.11 -> 4.7.13 2023-08-13 13:10:34 +00:00
esthromeris 96e3451390 fteqw: unstable-2022-08-09 -> unstable-2023-08-03 2023-08-13 14:05:09 +02:00
Azat Bahawi 0910b6c1c9
Merge pull request #246555 from azahi/qzdl
qzdl: init at unstable-2023-04-04
2023-08-13 14:33:49 +03:00
Sefa Eyeoglu a1a757feb8 prismlauncher: rename to programs/libs runtimePrograms/runtimeLibs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-13 07:10:04 +01:00
Sefa Eyeoglu 921102518a prismlauncher: add mesa-demos to PATH
Prism Launcher uses glxinfo to query GPU information.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-13 07:10:04 +01:00
Sefa Eyeoglu d60de69148 prismlauncher: add additionalPrograms parameter
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-13 07:10:04 +01:00
Sefa Eyeoglu 65db78515a prismlauncher: add flite for TTS support
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-13 07:10:04 +01:00
Artturi 2600d09113
Merge pull request #247562 from trofi/wesnoth-gcc-13-fix
wesnoth: backport gcc-13 fix
2023-08-13 06:47:34 +03:00
meppu 8a84833c2e
osu-lazer: 2023.803.0 -> 2023.811.0 2023-08-11 22:35:57 +03:00
meppu 0b4ba66034
osu-lazer-bin: 2023.803.0 -> 2023.811.0 2023-08-11 22:35:48 +03:00
Jan Malakhovski 7eefa92432 keeperrl: cleanup expression 2023-08-11 09:20:44 +00:00
Jan Malakhovski 0e38454027 treewide: noop: misc cleanups 2023-08-11 09:20:44 +00:00
K900 4660293567 forge-mtg: 1.6.56 -> 1.6.57
Trivial bump, requested on Matrix
2023-08-10 22:39:42 +03:00
Franz Pletz a1e5ebb20c
Merge pull request #246781 from jopejoe1/minecraft-servers
minecraft-server: fix update script and update versions
2023-08-10 16:02:27 +02:00
Atemu ce5e4a6ef2
Merge pull request #248162 from edanaher/anki-pass-command-line-arguments
anki-bin: pass command-line arguments through anki-wrapper
2023-08-10 09:59:29 +02:00
figsoda 17d404ee80 zig.hook: rename from zigHook
This makes using specific versions of zig easier (without overrides)
2023-08-10 02:37:53 +00:00
figsoda cd6d4800ed
Merge pull request #248164 from rardiol/openra
openra: drop rardiol maintainership
2023-08-09 14:54:33 -04:00
Ricardo Ardissone 960c4e36bd
openra: drop rardiol maintainership 2023-08-09 14:34:01 -03:00
Evan Danaher de88bd94d6 anki-bin: pass command-line arguments through anki-wrapper 2023-08-09 13:08:46 -04:00
Daniel Hill 71390f9bb6
openttd: add some missing dependencies (#247671)
Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
2023-08-09 14:53:08 +02:00
Nick Cao ab490f698b
Merge pull request #247833 from Luflosi/update/aaaaxy
aaaaxy: 1.4.39 -> 1.4.42
2023-08-08 18:46:32 -06:00
Vladimír Čunát 41c7605718
Merge #245935: staging-next 2023-07-28 2023-08-08 07:33:42 +02:00
Franz Pletz 01ed9866d6
Merge pull request #246532 from SFrijters/openttd-13.4 2023-08-08 04:12:49 +02:00
Luflosi 8cf38683bd
aaaaxy: 1.4.39 -> 1.4.42
https://github.com/divVerent/aaaaxy/releases/tag/v1.4.42
2023-08-07 20:03:10 +02:00
github-actions[bot] 462b4c7567
Merge master into staging-next 2023-08-07 18:01:16 +00:00
Sergei Trofimovich 25fed6c0ee wesnoth: backport gcc-13 fix
Without the change `wesnoth` fails to build against `gcc-13` as:

    $ nix build --impure --expr 'with import <nixpkgs> {}; wesnoth.override { stdenv = gcc13Stdenv; }' -L

    In file included from /build/source/src/serialization/base64.cpp:16:
    /build/source/src/serialization/base64.hpp:23:49: error: 'uint8_t' was not declared in this scope
       23 | using byte_string_view = std::basic_string_view<uint8_t>;
          |                                                 ^~~~~~~
    /build/source/src/serialization/base64.hpp:20:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
       19 | #include <vector>
      +++ |+#include <cstdint>
       20 |
2023-08-06 20:07:53 +01:00
R. Ryantm 4f312b2473 cdogs-sdl: 1.4.2 -> 1.5.0 2023-08-06 16:36:38 +00:00
github-actions[bot] c90f3611dc
Merge master into staging-next 2023-08-06 00:02:21 +00:00
Weijia Wang c447ba5801
Merge pull request #244180 from nrhtr/fix-supertuxkart-darwin
superTuxKart: fix missing dependency on darwin
2023-08-06 00:50:30 +02:00
Keenan Weaver d7768d14f6
doomrunner: 1.8.0 -> 1.8.1 2023-08-05 15:45:16 -05:00
github-actions[bot] e329dc70ee
Merge master into staging-next 2023-08-05 18:01:09 +00:00
Francesco Gazzetta 29115de76e
Merge pull request #246542 from fgaz/domination/1.2.8
domination: 1.2.7 -> 1.2.8
2023-08-05 17:41:40 +02:00
github-actions[bot] 6458cb74a2
Merge master into staging-next 2023-08-05 12:01:30 +00:00
Anderson Torres dd8d813a73 blackshades: use zigHook
Also, a cosmetic refactor:

- Reorder parameter listing
- Use rec-less, overlay-style overridable recursive attributes (in effect since
NixOS#119942);
- Remove nested with (according to
https://nix.dev/recipes/best-practices#with-scopes)
2023-08-05 11:10:50 +00:00
Francesco Gazzetta 1eb6175b0d domination: 1.2.8 -> 1.2.9 2023-08-05 10:52:05 +02:00
Vladimír Čunát 3af97fc9ee
treewide: amend hacks of removing $(pwd)
The strip phase is using $TMPDIR now, so it would fail with:
 mktemp: failed to create file via template 'striperr.XXXXXX': No such file or directory
2023-08-05 09:26:04 +02:00
Jack Connors d59a43bdb3
vintagestory: 1.18.6 -> 1.18.7
see: https://www.vintagestory.at/blog.html/news/v1187-thatll-buff-it-out-r361/
also updates the experimental version to 1.18.8-rc.1 (this is effectively the same as 1.18.7 but built on dotnet7) see: https://www.vintagestory.at/blog.html/news/v1188-rc1-the-plunge-to-net7-r362/
2023-08-05 04:17:29 +01:00
github-actions[bot] 3af9469ebd
Merge master into staging-next 2023-08-04 18:01:05 +00:00
Artturi d39659a5e8
Merge pull request #247095 from ambroisie/meta-main-program 2023-08-04 18:24:00 +03:00
Weijia Wang 80a2387e73
Merge pull request #246875 from r-ryantm/auto-update/ckan
ckan: 1.32.0 -> 1.33.2
2023-08-04 17:21:34 +02:00
Bruno BELANYI feac9edf6a treewide: add meta.mainProgram
Related PR: NixOS#246386
2023-08-04 10:32:10 +00:00
github-actions[bot] 83383ab4a5
Merge master into staging-next 2023-08-04 06:01:21 +00:00
Pierre Bourdon 0805d2fc36
Merge pull request #246898 from getchoo/prism-darwin
prismlauncher: add support for darwin
2023-08-04 05:30:06 +02:00
github-actions[bot] 0542af4e29
Merge master into staging-next 2023-08-04 00:02:04 +00:00
Weijia Wang 00abdb43c6
Merge pull request #247010 from wegank/smpeg-darwin
smpeg: unbreak on darwin
2023-08-04 00:05:12 +02:00
Aidan Gauland 4523c65f95
gogdl: apply upstream PR patch for timeouts issue 2023-08-04 09:48:25 +12:00
Weijia Wang d813fcfeff treewide: mark packages broken on darwin 2023-08-03 22:39:54 +02:00
github-actions[bot] e13e3f4c54
Merge master into staging-next 2023-08-03 18:01:14 +00:00
seth 7ed803a136
prismlauncher: add support for darwin 2023-08-03 12:56:06 -04:00
Jan Malakhovski d8f7f6a5ce treewide: noop: refer to src.name or similar in sourceRoot where appropriate, part 2: the non-trivial cases 2023-08-03 16:32:05 +00:00
Jan Malakhovski 5852f26bdc treewide: noop: refer to src.name or similar in sourceRoot where appropriate, part 1: trivial cases 2023-08-03 16:32:03 +00:00
Francesco Gazzetta 4d6f81debf domination: 1.2.7 -> 1.2.8
Source for rev 2433 corresponding to 1.2.8 is
https://discord.com/channels/809801422987067404/809801423482650627/1136445014671626360
2023-08-03 16:27:00 +02:00
meppu adda8c864c
osu-lazer: 2023.717.0 -> 2023.803.0 2023-08-03 16:25:26 +03:00
meppu 4e11f93118
osu-lazer-bin: 2023.717.0 -> 2023.803.0 2023-08-03 14:15:46 +03:00
R. Ryantm 970082f20b ckan: 1.32.0 -> 1.33.2 2023-08-02 23:32:08 +00:00
jopejoe1 0f47d4b51c minecraft-server: 1.20 -> 1.20.1, 1.7.9 -> 1.7.10 2023-08-02 15:31:56 +02:00
jopejoe1 4c5ac0094f minecraft-server: fix update script
Fixes 1.7.9 being newer than 1.7.10
2023-08-02 15:30:35 +02:00
github-actions[bot] e985f375f2
Merge master into staging-next 2023-08-02 12:01:27 +00:00
Azat Bahawi cc5cd006db
qzdl: init at unstable-2023-04-04 2023-08-01 15:31:37 +03:00
Stefan Frijters 000bb3038f
openttd-jgrpp: override meta.homepage and meta.changelog 2023-08-01 11:49:30 +02:00
Stefan Frijters 0e24afe8ea
openttd-jgrpp: 0.54.1 -> 0.54.4 2023-08-01 11:44:53 +02:00
Stefan Frijters 9a55390da7
openttd: 13.3 -> 13.4 2023-08-01 11:44:39 +02:00
R. Ryantm a50da75c9d unciv: 4.7.8-patch1 -> 4.7.11 2023-08-01 09:01:22 +00:00
Aidan Gauland 80701428e9
heroic: patch out DRM support
DRM support added in 2.9.0 prevent Heroic from running at all under
mainline Electron, instead requiring running against a non-free fork
with DRM support compiled in.
2023-08-01 16:41:10 +12:00
github-actions[bot] 8faf32ac60
Merge master into staging-next 2023-08-01 00:02:30 +00:00
Aidan Gauland 0e012f05c7
heroic: 2.8.0 -> 2.9.1
Now also depends upon nile.
2023-08-01 11:11:09 +12:00
Aidan Gauland 4d5658d7bd
nile: init at 1.0.0 2023-08-01 11:11:09 +12:00
Weijia Wang e658ffa994 treewide: cleanup maven packages 2023-07-31 21:13:09 +02:00
github-actions[bot] f77112cc67
Merge master into staging-next 2023-07-31 18:01:05 +00:00
Pol Dellaiera e80662ed6d
Merge pull request #246317 from rs0vere/hmcl
hmcl: init at 3.5.5
2023-07-31 15:43:23 +02:00
7c6f434c 380f998fe8
Merge pull request #246316 from wegank/ogre-14-init
ogre_14: init at 14.0.1
2023-07-31 13:11:07 +00:00
github-actions[bot] 050b858d31
Merge master into staging-next 2023-07-31 12:01:34 +00:00
Weijia Wang 2d69842838
Merge pull request #245931 from soupglasses/pkg/ns-usbloader-7.0
ns-usbloader: init at 7.0
2023-07-31 11:56:30 +02:00
Red Star Over Earth b4395db675
hmcl: init at 3.5.5 2023-07-31 17:03:00 +08:00
SamLukeYes bf287a02ca gnubg: add desktop item 2023-07-31 09:47:32 +01:00
SamLukeYes 45cbde5b8d gnubg: 1.06.002 -> 1.07.001 2023-07-31 09:47:32 +01:00
Weijia Wang 956bdd6f22 ogre_14: init at 14.0.1 2023-07-31 10:08:12 +02:00
Weijia Wang b21b03e8f7
Merge pull request #244457 from wegank/ogre-cleanup
opendungeons: unstable-2021-11-06 -> unstable-2023-03-18
2023-07-31 10:15:35 +03:00
github-actions[bot] 28f4120163
Merge master into staging-next 2023-07-31 06:01:30 +00:00
Aidan Gauland 5a29bee734
legendary-gl: 0.20.32 -> 0.20.33 2023-07-31 14:45:35 +12:00
Aidan Gauland 893ae858d5
gogdl: 0.7.2 -> 0.7.3 2023-07-31 14:43:04 +12:00
rotaerk e138e656c7 godot3: refactor and rename from godot
The godot base derivation was implemented by passing a recursive
attrset to mkDerivation. This is problematic because recursive
references to attributes that are later overridden don't notice the
override. Switched to the approach of giving mkDerivation a lambda
that receives a self argument, which allows recursive references to
the final value after overrides are applied.

The related derivations (for export templates, headless, and server
builds of godot) duplicated content from the base derivation. This
refactor eliminated that by using overridable attributes to
parameterize the scripts.

The main motivation for this refactor was to help me add derivations
for mono builds of godot.

Renamed to godot3 to distinguish from version 4, which is a complete
rewrite and effectively a different tool altogether.
2023-07-30 18:46:07 -04:00
R. Ryantm 15cadbb7c0 aaaaxy: 1.4.33 -> 1.4.39 2023-07-30 19:49:21 +00:00
Martin Weinelt 167f6dfee4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/libraries/science/astronomy/cfitsio/default.nix
2023-07-30 03:54:27 +02:00
Janik 7cdce123f5
Merge pull request #245350 from cmm/update/freeciv 2023-07-30 00:58:48 +02:00
Martin Weinelt 81f9ddb449
Merge pull request #245647 from majiru/jfsw
jfsw: init at 20211225
2023-07-29 14:03:50 +02:00
github-actions[bot] e6cd0a7c69
Merge master into staging-next 2023-07-29 00:02:02 +00:00
Pol Dellaiera bc647c0e38
Merge pull request #245873 from keenanweaver/doomrunner1.8.0
doomrunner: 1.7.3 -> 1.8.0
2023-07-28 23:19:51 +02:00
Silvan Mosberger a0b8caf3bc
Revert "lib.customisation: uncurry makeScopeWithSplicing" 2023-07-28 23:04:09 +02:00
Adam Joseph 12cb207d20
Merge pull request #245824 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing
lib.customisation: uncurry makeScopeWithSplicing
2023-07-28 20:55:44 +00:00
github-actions[bot] 039200b6c4
Merge staging-next into staging 2023-07-28 18:01:52 +00:00
Sofi 00d7684ad8
maintainers: rename imsofi to soupglasses 2023-07-28 20:01:06 +02:00
Artturi 314c4c1b6d
Merge pull request #244879 from Atemu/steam-small-dbus-steamvr 2023-07-28 19:04:25 +03:00
Artturin 3716ef19d8 lib.makeScopeWithSplicing: provide default for keep,extra
These are often unneeded by the user.
2023-07-28 17:41:01 +03:00
Keenan Weaver 45e394f5aa
doomrunner: 1.7.3 -> 1.8.0 2023-07-28 08:07:04 -05:00
Adam Joseph cb13669b00 lib.customisation: uncurry makeScopeWithSplicing
Deeply-curried functions are pretty error-prone in untyped languages
like Nix.  This is a particularly bad case because
`top-level/splice.nix` *also* declares a makeScopeWithSplicing, but
it takes *two fewer arguments*.

Let's switch to attrset-passing form, to provide some minimal level
of sanity-checking.
2023-07-27 21:31:59 -07:00
github-actions[bot] d1b1f7fda7
Merge staging-next into staging 2023-07-27 06:01:53 +00:00
Jacob Moody cd68dbf4c1 jfsw: init at stable-20211225 2023-07-27 00:04:23 -05:00
Jacob Moody 38bfa58772 hhexen: sdlmixer audio backend and various tidy 2023-07-27 00:16:48 -03:00
Jacob Moody c56fec9f9f hheretic: init at 0.2.3 2023-07-27 00:16:48 -03:00
Nick Cao e9d8b5d831
Merge pull request #245629 from r-ryantm/auto-update/minesweep-rs
minesweep-rs: 6.0.16 -> 6.0.19
2023-07-26 19:04:37 -06:00
R. Ryantm d4e1c00fa0 minesweep-rs: 6.0.16 -> 6.0.19 2023-07-27 00:16:58 +00:00