Commit Graph

6093 Commits

Author SHA1 Message Date
Thiago Kenji Okada
85505ee1cf osu-lazer: 2022.709.1 -> 2022.719.0 2022-07-19 23:36:47 +01:00
github-actions[bot]
cfe78489c9
Merge master into staging-next 2022-07-19 12:01:43 +00:00
Francesco Gazzetta
00f62a4a6f domination: 1.2.4 -> 1.2.5 2022-07-19 13:40:45 +02:00
Nguyễn Gia Phong
310ce906b6 hedgewars: use qt514's overridden glibc++ 2022-07-19 13:33:04 +02:00
github-actions[bot]
83702a6ef7
Merge master into staging-next 2022-07-18 18:01:14 +00:00
7c6f434c
3aa086b0f0
Merge pull request #181944 from tomfitzhenry/sgtpuzzles-cmake
sgtpuzzles: bump 2 years, and fix icons
2022-07-18 14:14:12 +00:00
Tom Fitzhenry
55a280290d sgtpuzzles: add tomfitzhenry@ as co-maintainer 2022-07-18 22:52:06 +10:00
Tom Fitzhenry
59cc4254df sgtpuzzles: Use higher resolution icons: 48x48 -> 96x96
Motivation: The 48x48 icons look fuzzy on my 1080 width monitor, and
on the Pinephone.
2022-07-18 22:52:06 +10:00
Tom Fitzhenry
61bf2a9c68 sgtpuzzles: 20200610.9aa7b7c -> 20220613.387d323
This required moving to sgtpuzzle's cmake-based build:
https://git.tartarus.org/?p=simon/puzzles.git;a=commit;h=cc7f5503dc8f4ddf468e080a73028c83d1196e83

Tested by compiling and playing some games on x86_64.
2022-07-18 22:52:06 +10:00
Tom Fitzhenry
34aa48f578 sgtpuzzles: Fix Icon path.
Prior to this commits, GNOME did not render icons for sgtpuzzle's
desktop items.
2022-07-18 22:52:06 +10:00
Tom Fitzhenry
b3b78ce3ef sgt-puzzles: update sgt-puzzles.menu to a working URL
Motivation: Fix sgt-puzzles.menu. Its URL is currently 404ing since
720e614d01/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
is 404ing because https://github.com/Oleh-Kravchenko/portage is 404ing.
2022-07-18 22:52:06 +10:00
K900
0ff0b14968 treewide: more cmake rpath fixups 2022-07-17 17:42:15 +03:00
Troels Henriksen
8d63f78354 uqm: 0.7.0 -> 0.8.0 2022-07-17 09:27:11 +02:00
github-actions[bot]
8df1eb061a
Merge master into staging-next 2022-07-17 00:02:14 +00:00
Sandro
86725ce26a
Merge pull request #181416 from virchau13/add-stdenv-lib
polymc: add stdenv.cc.cc.lib to GAME_LIBRARY_PATH
2022-07-16 23:33:03 +02:00
Vladimír Čunát
0879ac5da6
Merge branch 'master' into staging-next 2022-07-16 20:07:05 +02:00
Thiago Kenji Okada
18ff3873e5
Merge pull request #180792 from delroth/osu-lazer-bump
osu-lazer: 2022.409.0 -> 2022.709.1
2022-07-16 18:34:25 +01:00
Mario Rodas
6e0e3f0948
Merge pull request #181141 from leifhelm/factorio
factorio: 1.1.59 -> 1.1.61
2022-07-16 09:09:06 -05:00
Vladimír Čunát
38ca74efcb
Merge #180818: remove myself from some meta.maintainers 2022-07-16 09:26:33 +02:00
github-actions[bot]
9f53d5cc15
Merge master into staging-next 2022-07-15 18:01:23 +00:00
Guillaume Girol
f791f98df8
Merge pull request #180286 from oxzi/openrct2-0.4.1
openrct2: 0.4.0 -> 0.4.1
2022-07-15 16:11:10 +00:00
legendofmiracles
f0f4539054
Merge pull request #181200 from atemp/emp_ddnet_16.2
ddnet: 16.2.1 -> 16.2.2
2022-07-15 07:39:47 -06:00
Vir Chaudhury
050161d39c
polymc: add stdenv.cc.cc.lib to GAME_LIBRARY_PATH
Some Minecraft mods (like DiscordRichPresence) require libstdc++.
This commit adds stdenv.cc.cc.lib to $GAME_LIBRARY_PATH so that these
mods function correctly.
2022-07-14 07:42:13 +08:00
github-actions[bot]
00ec8bc8d3
Merge master into staging-next 2022-07-13 18:01:28 +00:00
Bobby Rong
fee5655a4d
Merge pull request #181181 from r-ryantm/auto-update/fheroes2
fheroes2: 0.9.16 -> 0.9.17
2022-07-13 20:36:22 +08:00
Vladimír Čunát
8169a7fce0
Merge branch 'master' into staging-next 2022-07-13 09:57:41 +02:00
Luna Nova
6537fa2abb
steam/fhsenv.nix: Add libindicator-gtk2 and libdbusmenu-gtk2 (#181023)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-07-12 15:14:06 +02:00
Heinz Deinhart
7732635d42 ddnet: 16.2.1 -> 16.2.2 2022-07-12 12:01:47 +02:00
R. Ryantm
5cc64d917f fheroes2: 0.9.16 -> 0.9.17 2022-07-12 02:36:04 +00:00
github-actions[bot]
5f2ff17a45
Merge master into staging-next 2022-07-11 18:01:16 +00:00
Jakob Leifhelm
cf5db5cd18
factorio: 1.1.59 -> 1.1.61 2022-07-11 19:52:09 +02:00
legendofmiracles
49546f4413
Merge pull request #181056 from r-ryantm/auto-update/ddnet
ddnet: 16.2 -> 16.2.1
2022-07-11 11:38:14 -06:00
Thomas Tuegel
e1e0d5d513
Merge pull request #108496 from knedlsepp/cmake-rpath
cmake/setup-hook.sh: Don't skip build-RPATH
2022-07-11 10:18:47 -05:00
R. Ryantm
24eb6920dc ddnet: 16.2 -> 16.2.1 2022-07-11 06:59:19 +00:00
Bobby Rong
0cc4ce15da
Merge pull request #180996 from theRookieCoder/patch-1
`ferium`: Update description and homepage
2022-07-11 12:00:04 +08:00
Ilesh Thiada
0511eceae6
ferium: Update description and homepage
Update the description and homepage of the ferium package
2022-07-10 22:03:44 +05:30
Jonas Heinrich
cb6a80cee0 gnubg: Fix build 2022-07-09 08:21:16 -05:00
Vladimír Čunát
27d6965d8e
pidgin, libmaxminddb, simutrans, tiptop: remove myself
... from meta.maintainers.  I haven't been willing to spend
nontrivial effort on these packages in the past year or more.
I don't use them anymore.
2022-07-09 09:09:27 +02:00
ajs124
c2cad4f39e
Merge pull request #179098 from r-ryantm/auto-update/extremetuxracer 2022-07-09 01:39:29 +02:00
Pierre Bourdon
22c854414f
osu-lazer: 2022.409.0 -> 2022.709.1 2022-07-09 01:20:25 +02:00
R. Ryantm
3e65be6910 bugdom: 1.3.1 -> 1.3.2 2022-07-07 19:36:20 +00:00
sternenseemann
9fbc67d63e opensoldat: rename from soldat-unstable
Upstream project was [renamed] which removes the ambiguity with
Soldat 1.7 as well as Soldat 2.

[renamed]: 0fec3d86af
2022-07-07 17:58:03 +02:00
sternenseemann
1812c19e36 soldat-unstable: 2021-11-01 -> 2022-07-02
* Support for GameNetworkingSockets 1.4.*

* Renamed to opensoldat, requiring us to adjust some links and pnames.
  $XDG_CONFIG_HOME/soldat is left as is for now in order to not break
  existing users configurations.
2022-07-07 17:58:03 +02:00
R. Ryantm
ea78ceef64 extremetuxracer: 0.8.1 -> 0.8.2 2022-07-07 13:48:07 +00:00
R. Ryantm
1c755103fe ferium: 4.1.1 -> 4.1.5 2022-07-07 11:33:07 +00:00
superherointj
86de228c5d
Merge pull request #180380 from atemp/emp_ddnet_16.2
ddnet 16.1 -> 16.2
2022-07-06 17:40:17 -03:00
superherointj
4f8ba02162
Merge pull request #179639 from SuperSamus/rare
rare: cleanup
2022-07-06 16:19:48 -03:00
Heinz Deinhart
9674356b09 ddnet 16.1 -> 16.2 2022-07-06 21:12:16 +02:00
Sebastian Reuße
1bf922e038 cdogs-sdl: 0.13.0 -> 1.3.1 2022-07-06 14:13:22 -03:00
Alvar Penning
c99706f826 openrct2: 0.4.0 -> 0.4.1
- Split included arguments into lines for more readable diffs.
- Include flac/ogg/vorbis, as they are now required.
- Include discord-rpc and gbenchmark as their absence disabled those
  features, especially Discord support for those who might want it.

https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.1
2022-07-06 00:12:20 +02:00
Josef Kemetmüller
bcd7045998 treewide: Remove now-unneeded LD_LIBRARY_PATH in cmake derivations
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run
the checkPhase of cmake derivations without having to tweak the
LD_LIBRARY_PATH anymore.
2022-07-04 03:49:01 +03:00
Moritz Kiefer
c1a59f40e0 xonotic: 0.8.2 -> 0.8.5 2022-07-01 20:14:12 +02:00
Martino Fontana
20f9469625 rare: cleanup 2022-07-01 17:30:48 +02:00
Robert Hensing
1e17bb943e
Merge pull request #164662 from infinisil/fetchurl-curlOpts-list
fetchurl: Allow passing curl options with spaces
2022-06-30 21:10:57 +02:00
Evgeny Kurnevsky
9e106c15a4 wesnoth: 1.16.1 -> 1.16.3 2022-06-30 20:43:56 +08:00
ajs124
466b14712f maintainers: remove bjg
does not seem to have contributed since nixpkgs migrated to git
2022-06-29 00:55:00 +02:00
ajs124
0c35b851e4 maintainers: remove kkallio
no github account linked
2022-06-29 00:55:00 +02:00
ajs124
143efb53d6 maintainers: remove m3tti
no github account linked
2022-06-29 00:55:00 +02:00
ajs124
fd75d8c2d3 maintainers: remove chattered
no github account linked
2022-06-29 00:55:00 +02:00
ajs124
59d8f2b1cd maintainers: remove Nate-Devv
no github account + only two commits 251a1ccf55 and 09f366a360
2022-06-29 00:52:13 +02:00
ajs124
ff2925fe6b maintainers: remove piotr
has not contributed since nixpkgs migrated to git
2022-06-29 00:52:13 +02:00
ajs124
99466ee39e maintainers: remove petabyteboy
github account deleted
2022-06-29 00:52:12 +02:00
Vladimír Čunát
06e4e9c867
Merge #178690: staging-next 2022-06-23 2022-06-28 00:53:14 +02:00
Artturi
89e1ee9fb3
Merge pull request #179360 from sshilovsky/patch-1 2022-06-28 00:56:45 +03:00
Sergei Shilovsky
7b5ee88acb vintagestory: 1.16.4 -> 1.16.5 2022-06-27 21:57:05 +03:00
github-actions[bot]
b1e76b5db1
Merge master into staging-next 2022-06-27 00:02:25 +00:00
Sandro
09b3a4e4cb
Merge pull request #178069 from kenranunderscore/package-infra-arcana
infra-arcana: init at 21.0.1
2022-06-26 20:07:24 +02:00
github-actions[bot]
d77dd87222
Merge master into staging-next 2022-06-26 12:01:16 +00:00
Anderson Torres
a9be6ee37c
Merge pull request #178338 from yrd/graphwar
graphwar: init at 1.0.0
2022-06-26 08:54:38 -03:00
github-actions[bot]
aa36d9ee78
Merge master into staging-next 2022-06-26 00:02:17 +00:00
Martin Weinelt
fc785734f0
Merge pull request #178938 from r-ryantm/auto-update/legendary-gl 2022-06-26 01:08:36 +02:00
Guillaume Girol
904740b13e
Merge pull request #177802 from kenranunderscore/small-sil-cleanup
sil / sil-q: clean up and add tests
2022-06-25 22:08:05 +00:00
leo60228
7d1a3b110f ferium: init at 4.1.1 2022-06-25 15:55:40 -04:00
github-actions[bot]
62b079eb5d
Merge master into staging-next 2022-06-25 12:01:16 +00:00
Guillaume Girol
2417363ae2
Merge pull request #178141 from kenranunderscore/continue-umoria-characters
umoria: fix savefile persistence (#178136); refactor and extend
2022-06-25 11:24:52 +00:00
R. Ryantm
22e2d3d6b4 legendary-gl: 0.20.26 -> 0.20.27 2022-06-25 05:52:58 +00:00
github-actions[bot]
c3dedde930
Merge master into staging-next 2022-06-24 18:01:11 +00:00
Sandro
e24ce21faa
Merge pull request #173613 from SuperSamus/itch 2022-06-24 16:26:54 +02:00
github-actions[bot]
def2d62aea
Merge master into staging-next 2022-06-24 12:01:49 +00:00
Lassulus
556b72e578
Merge pull request #178362 from fgaz/gnonograms/2.1.2
gnonograms: 2.0.0 -> 2.1.2
2022-06-24 10:44:07 +02:00
github-actions[bot]
880ae7cccd
Merge master into staging-next 2022-06-24 06:01:20 +00:00
Mario Rodas
decc63096f
Merge pull request #178762 from greizgh/update-freeciv
freeciv: 3.0.1 -> 3.0.2
2022-06-24 00:27:09 -05:00
github-actions[bot]
5b9ee17283
Merge master into staging-next 2022-06-24 00:02:29 +00:00
Thiago Kenji Okada
e6213e3f47
Merge pull request #174759 from IvarWithoutBones/init/sm64-coop
sm64ex-coop: init at 0.pre+date=2022-05-14
2022-06-23 21:01:56 +01:00
Greizgh
614ad1c1c0
freeciv: 3.0.1 -> 3.0.2 2022-06-23 18:35:25 +02:00
Mario Rodas
bf550798ca
Merge pull request #177586 from OPNA2608/fix/srb2_openmpt123_libopenmpt
srb2: openmpt123 -> libopenmpt
2022-06-22 22:13:00 -05:00
Martino Fontana
b3080101af itch-setup: remove 2022-06-22 14:58:28 +02:00
Martino Fontana
deabb657a2 itch: install binary in system 2022-06-22 14:58:28 +02:00
Martino Fontana
e9b39ae01c butler: init at 15.21.0 2022-06-22 14:58:24 +02:00
necessarily-equal
588c4f214e
unvanquished: fix sdl event overflow (#178106)
Fixes https://github.com/DaemonEngine/Daemon/issues/600
2022-06-22 00:29:21 +02:00
Yannik Rödel
2c13f8ea93 graphwar: init at 1.0.0 2022-06-21 14:00:07 +02:00
Francesco Gazzetta
59c158c8fd pokete: 0.7.2 -> 0.7.3 2022-06-21 10:50:05 +02:00
Francesco Gazzetta
0b7337095a gnonograms: 2.0.0 -> 2.1.2 2022-06-20 22:17:55 +02:00
Ivv
71003947fc
Merge pull request #177991 from mdarocha/dotnet-6-update
dotnet-sdk: 6.0.300 -> 6.0.301
2022-06-20 19:56:52 +02:00
Johannes Maier
c6f4366305 infra-arcana: init at 21.0.1 2022-06-20 16:19:00 +02:00
Lassulus
2ce24f1a5d
Merge pull request #169843 from r-ryantm/auto-update/gcompris
gcompris: 2.3 -> 2.4
2022-06-20 11:36:13 +02:00
Sandro
3d6a6aa989
Merge pull request #158044 from pasqui23/gamehub
gamehub: init at 0.16.3-2
2022-06-19 11:52:01 +02:00
Sandro
d11a703d95
Merge pull request #177894 from fgaz/pokete/init 2022-06-19 11:51:52 +02:00
Sandro
42ff489d53
pokete: drop default platform 2022-06-19 11:30:48 +02:00
Sandro
753b852859
Merge pull request #173894 from fgaz/titanion/init
titanion: init at 0.3
2022-06-18 23:01:32 +02:00
Francesco Gazzetta
11c5f73828 pokete: init at 0.7.2 2022-06-18 21:47:41 +02:00
pasqui23
e4c6c49cf7
GameHub: better description from @AnsersonTorres
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
2022-06-18 14:47:36 +00:00
Bobby Rong
1ab639dee6
Merge pull request #177457 from r-ryantm/auto-update/fheroes2
fheroes2: 0.9.15 -> 0.9.16
2022-06-18 22:37:08 +08:00
Johannes Maier
acf302428e umoria: refactor and extend
- Simplify some symlinking
- Don't remove the temporary run directory: umoria allows for dumping
  character info, which would be in there and inaccessible after
  saving the game otherwise.  The system takes care of cleaning up
  the temporary directory anyway.
- Allow passing arguments to the wrapped executable, allowing using
  different save directories, passing game seeds, checking out
  highscores, etc.
2022-06-18 14:22:24 +02:00
Johannes Maier
bfc755d4d0 umoria: fix savegame handling
It was impossible to continue a saved character before, as the
`cleanup` function would remove the whole temporary RUNDIR, including
the actual save file.

umoria allows passing a custom save file location, which now points to
the already-used data directory ~/.umoria.

Fixes #178136
2022-06-18 14:22:24 +02:00
OPNA2608
643104fece srb2: openmpt123 -> libopenmpt 2022-06-18 11:23:42 +02:00
Pasquale
207a128a69
GameHub: init at 0.16.3-2
a
2022-06-18 11:23:08 +02:00
Anderson Torres
9877c29734
Merge pull request #169120 from aciceri/master
umoria: init at 5.7.15
2022-06-17 18:25:17 -03:00
Sergei Trofimovich
0e2797784d
Merge pull request #176938 from trofi/fix-fno-common-for-megaglest
megaglest: pull upstream fix for -fno-common toolchains
2022-06-17 20:44:56 +00:00
Sandro
daa987e393
Merge pull request #177089 from trofi/workaround-fno-common-for-garden-of-coloured-lights
garden-of-coloured-lights: add -fcommon workaround
2022-06-17 22:11:21 +02:00
mdarocha
bcd447ed3c xivlauncher: update dependencies 2022-06-17 10:12:44 +02:00
mdarocha
a75522db45 osu-lazer: update dependencies 2022-06-17 10:12:43 +02:00
Robert Scott
3cd98829ee
Merge pull request #177212 from risicle/ris-native-source-provenance-games-misc
treewide/games,misc: add `sourceType` `binaryNativeCode` for many packages
2022-06-16 20:54:20 +01:00
Johannes Maier
44feda004b sil-q: add a test
Check whether creating the save directory works (as a test in
passthru.tests).
2022-06-15 23:37:26 +02:00
Johannes Maier
3876d53242 sil: clean up a bit and add a test
- Add meta.mainProgram to be able to use nix run
- Run preInstall and postInstall hooks
- Test creation of the save directory in passthru.tests
- Fix some typos and misformatting
- Change prePatch to postPatch (as in the suggestion I got when adding
  sil-q)
2022-06-15 23:37:26 +02:00
Rick van Schijndel
a2af67230b
Merge pull request #177222 from cmm/freeciv-3.0.1
freeciv: 2.6.6 -> 3.0.1
2022-06-15 20:31:46 +02:00
Sandro
f600a0dfd8
Merge pull request #177331 from kenranunderscore/add-sil-q 2022-06-15 01:32:21 +02:00
Michael Livshin
9ae248d5ba freeciv: 2.6.6 -> 3.0.1
* change the default client to gtk (because sdl2 is marked experimental)

* use sdl2 sound in all clients
2022-06-14 09:16:06 +03:00
Mario Rodas
54c558e455
Merge pull request #177433 from muscaln/polymc-1.3.2
polymc: 1.3.1 -> 1.3.2
2022-06-14 00:05:49 -05:00
Sergei Trofimovich
ddc5ceb929
Merge pull request #177094 from trofi/fix-fno-common-for-neverball
neverball: pull upstream fix for -fno-common toolchains
2022-06-13 21:59:55 +00:00
Johannes Maier
312078319c sil-q: init at v1.5.0
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-06-13 23:07:36 +02:00
Sergei Trofimovich
3c1e24d599
Merge pull request #177095 from trofi/fix-fno-common-for-rocksndiamonds
rocksndiamonds: pull upstream fix for -fno-common toolchains
2022-06-13 16:59:14 +00:00
R. Ryantm
53726902c8 fheroes2: 0.9.15 -> 0.9.16 2022-06-13 02:32:55 +00:00
Mustafa Çalışkan
68c360c518 polymc: 1.3.1 -> 1.3.2 2022-06-12 22:49:54 +03:00
Linus Heckemann
6036dcbdb9
Merge pull request #176774 from robintown/minecraft-server
minecraft-server: 1.18.2 -> 1.19
2022-06-11 16:23:24 +02:00
Johannes Maier
5e8d7cb756 angband: add SDL2 frontend
This makes it possible to compile Angband against SDL2 (and its other
libraries) to have a graphical frontend available, with tiles and
sound.  The default remains ASCII-only Angband; enable SDL2 by using
an override.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-06-11 10:46:54 +02:00
7c6f434c
c0d782e7b7
Merge pull request #177114 from astro/speed-dreams
speed-dreams: 2.2.2 -> 2.2.3
2022-06-11 07:17:59 +00:00
Artturi
b03082ac79
Merge pull request #176384 from helium18/master
grapejuice: 4.10.2 -> 5.1.1
2022-06-11 01:45:23 +03:00
Robert Scott
9fc90429c3 treewide/games,misc: add sourceType binaryNativeCode for many packages 2022-06-10 21:12:22 +01:00
AndersonTorres
3f953478be unvanquished: use SRI hash format 2022-06-09 23:33:55 -03:00
AndersonTorres
2275593fe8 openttd/nml.nix: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
3b224dccc3 zoom: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
ce51fe80f8 zdoom: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
95390a3e13 zandronum/sqlite.nix: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
494ef5a68c vectoroids: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
5b6c9db810 performous: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
8e41788cba leela-zero: use SRI hash format 2022-06-09 23:33:54 -03:00
AndersonTorres
d2ebaafd90 koules: use SRI hash format 2022-06-09 23:33:53 -03:00
AndersonTorres
e28fc76d2c julius: use SRI hash format 2022-06-09 23:33:53 -03:00
AndersonTorres
0036078a21 gshogi: use SRI hash format 2022-06-09 23:33:53 -03:00
AndersonTorres
1404529e1d fairymax: use SRI hash format 2022-06-09 23:33:53 -03:00
AndersonTorres
233e380f3b tworld2: use SRI hash format 2022-06-09 23:16:59 -03:00
AndersonTorres
2922710cb5 otto-matic: use SRI hash format 2022-06-09 23:16:59 -03:00
AndersonTorres
8f3e98cf28 bugdom: use SRI hash format 2022-06-09 23:16:58 -03:00
Astro
90f443a17b speed-dreams: 2.2.2 -> 2.2.3 2022-06-10 03:23:27 +02:00
Sergei Trofimovich
ce5eca92f1 rocksndiamonds: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:

    ld: libgame/libgame.a(system.o):src/libgame/system.c:41: multiple definition of
      `setup'; main.o:src/main.c:140: first defined here
2022-06-09 22:42:15 +01:00
Sergei Trofimovich
1ee09a25e8 neverball: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:

    ld: ball/st_save.o:(.bss+0x0): multiple definition of
      `text_input'; share/text.o:(.bss+0x0): first defined here
2022-06-09 22:22:21 +01:00
Sergei Trofimovich
8fc1c4255f garden-of-coloured-lights: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: main.o:src/main.c:58: multiple definition of
      `eclass'; eclass.o:src/eclass.c:21: first defined here
2022-06-09 22:00:49 +01:00
Sergei Trofimovich
27d3d3bb04 megaglest: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:

    ld: liblibmegaglest.a(ftpLib.c.o):(.bss+0x28): multiple definition of
      `VERBOSE_MODE_ENABLED'; liblibmegaglest.a(miniftpserver.cpp.o):(.bss+0x30): first defined here
2022-06-08 19:47:41 +01:00
Pascal Wittmann
48195904d5
Merge pull request #176001 from NixOS/update-and-fix-stuntrally
stuntrally: 2.6.1 -> 2.6.2
2022-06-08 10:35:21 +02:00