3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6472 commits

Author SHA1 Message Date
Sandro Jäckel cdfd73026a
dwarf-fortress-unfuck: don't overwrite to null on none linux platforms 2022-10-27 18:55:04 +02:00
Sergei Trofimovich bac254b3dc
Merge pull request #198019 from trofi/eduke32-fix
eduke32: fix build by removing explicit header paths
2022-10-27 11:34:02 +01:00
Sergei Trofimovich c3e1a9697d eduke32: fix build by removing explicit header paths
In https://github.com/NixOS/nixpkgs/pull/197798#issuecomment-1291196023
we noticed that `eduke32` fails to build as:

    source/build/include/sdl_inc.h:17:12: fatal error: SDL2/SDL.h: No such file or directory
       17 | #  include <SDL2/SDL.h>
          |            ^~~~~~~~~~~~

It statred after https://github.com/NixOS/nixpkgs/pull/191724 where
`NIX_CFLAGS_COMPILE` entries were cleaned up slightly.

This change works build failure around. But I think it's a good change:
there should be no reason to set SDL2 offset via forced include paths.
2022-10-27 08:17:23 +01:00
R. Ryantm e82d8ad758 legendary-gl: 0.20.29 -> 0.20.30 2022-10-27 01:00:32 -04:00
Sandro 45d1ffb078
Merge pull request #197150 from LunNova/lunnova/prism-launcher-qt6 2022-10-26 21:56:29 +02:00
Mario Rodas c3cf258cdb
Merge pull request #197504 from chvp/fix-zeroad-build
zeroad: fix build
2022-10-26 06:07:02 -05:00
Charlotte Van Petegem ccd8299714
zeroad: fix build 2022-10-25 21:09:14 +02:00
Sandro 8ee9c8d3ed
Merge pull request #192118 from SuperSamus/rare 2022-10-25 15:22:54 +02:00
Martino Fontana 00b57fb2c0 rare: 1.8.9 -> 1.9.2 2022-10-24 23:53:32 +02:00
ash 97c97f5c4e xivlauncher: 1.0.1.0 -> 1.0.2 2022-10-24 18:34:16 +01:00
Ingo Blechschmidt 150a54fee9 tuxpaint: 0.9.27 -> 0.9.28 2022-10-24 14:22:30 +02:00
Jack Cummings 5d2907308f widelands 1.0 -> 1.1
Remove in-tree patch, as it isn't needed anymore.
Addresses #197395.
2022-10-23 22:51:22 -07:00
Mario Rodas bdb2cf6de3
Merge pull request #193284 from m0rg-dev/pysolfc-2.16.0
pysolfc: 2.6.4 -> 2.16.0

Closes #190799
2022-10-23 18:34:23 -05:00
Luna Nova a7f6c1dd96
prismlauncher: pass -DLauncher_QT_VERSION_MAJOR=6 on qt6, add qtsvg dep for icons 2022-10-22 08:02:10 -07:00
Martin Weinelt 80fc469031 Merge remote-tracking branch 'origin/master' into staging-next 2022-10-21 22:33:42 +02:00
Sandro 5106dc0ddb
Merge pull request #196397 from fgaz/hikounomizu/init 2022-10-21 19:57:12 +02:00
Francesco Gazzetta 0eceb37a6c
hikounomizu: build data in parallel
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-10-21 12:21:31 +00:00
github-actions[bot] 6e9b36d7a0
Merge master into staging-next 2022-10-20 06:05:55 +00:00
Sandro c0e2314de6
Merge pull request #195896 from wegank/megaglest-fix
megaglest: fix broken build
2022-10-20 03:38:32 +02:00
Sandro 42c6b4c3e3
Merge pull request #195892 from wegank/fsg-wxgtk
fsg: migrate to wxGTK32
2022-10-20 03:38:11 +02:00
Sandro 2237bf9c1b
Merge pull request #195889 from wegank/asc-wxgtk
asc: migrate to wxGTK32
2022-10-20 03:37:29 +02:00
R. Ryantm 742243f041 wesnoth: 1.16.5 -> 1.16.6 2022-10-20 09:07:48 +08:00
github-actions[bot] aac580f88f
Merge master into staging-next 2022-10-20 00:05:13 +00:00
Artturi 0ca70b19e4
Merge pull request #196448 from quasigod-io/grapejuice
grapejuice: 5.5.4 -> 6.2.2
2022-10-20 01:00:24 +03:00
Skyler Grey 879c2dffe1
polymc: remove
- As polymc has been hostily taken over, prismlauncher (the fork) should
  be used instead
- The previous commit packages prismlauncher, this commit makes it so
  that installing polymc will give an error message
2022-10-19 19:06:54 +01:00
Skyler Grey 290d7b2819
prismlauncher: init at 5.0 2022-10-19 19:06:49 +01:00
Jan Tojnar 457f28f6f8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/tools/codespell/default.nix

codespell 2.2.2 switched to pyproject & setuptools_scm:
https://github.com/codespell-project/codespell/pull/2523
2022-10-19 05:24:28 +02:00
Atemu 4d6a748099 BeatSaberModManager: use substituteAll instead of custom postPatch 2022-10-19 02:14:28 +02:00
Atemu ea570d1ed3 BeatSaberModManager: leave link to PR comment for context 2022-10-18 23:51:39 +02:00
Atemu 0fb17c04fe BeatSaberModManager: install as single file 2022-10-18 23:39:42 +02:00
Atemu 6fdd38373e BeatSaberModManager: init at 0.0.2 2022-10-18 23:00:50 +02:00
Pascal Bach 444bc80848
Merge pull request #196029 from r-ryantm/auto-update/freeciv
freeciv: 3.0.3 -> 3.0.4
2022-10-18 12:37:47 +02:00
Tris Emmy Wilson 9d27de8105 polymc: mark knownVulnerabilities OVE-20221017-0001
see #196460, https://xeiaso.net/blog/OVE-20221017-0001
2022-10-17 16:45:15 -05:00
quasigod-io c7ee149d58 grapejuice: 5.5.4 -> 6.2.2 2022-10-17 14:31:24 -04:00
github-actions[bot] 3834216ec6
Merge master into staging-next 2022-10-17 18:10:17 +00:00
R. Ryantm 5a61f4450b unciv: 4.2.11 -> 4.2.13 2022-10-17 22:21:42 +08:00
Francesco Gazzetta 8edb36074d hikounomizu: init at 0.9.2 2022-10-17 12:09:46 +02:00
github-actions[bot] f52955a521
Merge master into staging-next 2022-10-16 18:01:42 +00:00
Atemu 009567814b
steam-run: provide meta (#196273)
Fixes https://github.com/NixOS/nix/issues/4527
2022-10-16 16:18:10 +02:00
R. Ryantm 98919e764f gemrb: 0.9.1 -> 0.9.1.1 2022-10-16 22:14:05 +08:00
github-actions[bot] e648107a22
Merge master into staging-next 2022-10-16 06:06:19 +00:00
R. Ryantm 8bbbedd5a6 gogdl: 0.3 -> 0.4 2022-10-16 12:26:21 +08:00
Martin Weinelt 51fcbf5bb7 Merge remote-tracking branch 'origin/master' into staging-next 2022-10-16 00:18:40 +02:00
Artturi 4c9e74c44b
Merge pull request #193839 from r-ryantm/auto-update/vintagestory 2022-10-15 22:36:03 +03:00
Anderson Torres fc4e7ce1f9
Merge pull request #195694 from laalsaas/solicurses
SoliCurses: init at unstable-2022-02-13
2022-10-15 14:43:04 -03:00
Reed 653e881d1c shticker-book-unwritten: 1.0.3 -> 1.2.0 2022-10-15 09:34:16 -04:00
laalsaas 4eb8ac55c9 SoliCurses: init at unstable-2022-02-13 2022-10-15 15:11:07 +02:00
github-actions[bot] 4f07e7f326
Merge master into staging-next 2022-10-15 06:07:54 +00:00
Artturi 4329a219a4
Merge pull request #194525 from cpu/cpu-rust-bindgenHook-cleanup 2022-10-15 05:08:11 +03:00
Artturi 56cbdc3b83
Merge pull request #195874 from Artturin/removeinheritxorg 2022-10-15 04:27:23 +03:00
github-actions[bot] 886633ba43
Merge master into staging-next 2022-10-15 00:04:00 +00:00
Mario Rodas dfb28590f7
Merge pull request #195903 from wegank/zod-wxgtk
zod: fix build on aarch64-linux
2022-10-14 18:38:43 -05:00
R. Ryantm 993e453d72 freeciv: 3.0.3 -> 3.0.4 2022-10-14 17:49:54 +00:00
Artturin 61c3058bcb all-packages.nix: remove inherit (*xorg) *'s
using inherits in callPackage args is discouraged and doesn't splice
correctly
2022-10-14 20:48:09 +03:00
Weijia Wang 022e555d67 zod: migrate to wxGTK32 2022-10-14 05:59:59 +02:00
Weijia Wang c548b9e83b scorched3d: migrate to wxGTK32 2022-10-14 05:28:40 +02:00
Weijia Wang 2c10164855 megaglest: fix broken build 2022-10-14 05:13:11 +02:00
Weijia Wang 37494841ba fsg: migrate to wxGTK32 2022-10-14 04:38:35 +02:00
Weijia Wang ce12c5feda asc: migrate to wxGTK32 2022-10-14 04:14:01 +02:00
github-actions[bot] 62bcf0ac62
Merge staging-next into staging 2022-10-13 12:02:06 +00:00
Sergei Trofimovich e506bb3c95
Merge pull request #195399 from r-ryantm/auto-update/fheroes2
fheroes2: 0.9.19 -> 0.9.20
2022-10-13 12:35:05 +01:00
Vladimír Čunát 00a757ed3f
Merge branch 'master' into staging 2022-10-13 08:27:55 +02:00
Martin Weinelt bbbaaa3e35
Merge pull request #195610 from wegank/0ad-aarch64 2022-10-13 01:34:24 +02:00
Artturi e66d2fd89d
Merge pull request #194256 from Artturin/treewides2 2022-10-13 00:08:01 +03:00
Sandro 2678c1b034
Merge pull request #193484 from wegank/gpl1-eol 2022-10-12 21:04:31 +02:00
Weijia Wang 284adcab1f zeroad: fix build on aarch64-linux 2022-10-12 20:02:26 +02:00
Jonas Heinrich fc0c0a17ca
Merge pull request #195536 from 360ied/classicube-1.3.3
classicube: 1.3.2 -> 1.3.3
2022-10-12 09:57:14 +02:00
Vladimír Čunát b2a5c364d7
heroic: don't use the kdialog top-level alias
https://hydra.nixos.org/log/ygsis1s955063im3i37cqwb9grfjyfsz-nixpkgs-release-checks.drv
2022-10-12 08:43:30 +02:00
Sergei Trofimovich ddb10345b1
Merge pull request #195043 from trofi/astromenace-without-xlibsWrapper
astromenace: use xorg.* packages directly instead of xlibsWrapper ind…
2022-10-11 23:22:50 +01:00
Sandro 0cb2fdf0da
Merge pull request #187960 from aidalgol/heroic-fixes 2022-10-11 21:11:39 +02:00
360ied 3f525e0de4 classicube: 1.3.2 -> 1.3.3 2022-10-11 10:48:39 -04:00
Weijia Wang 50d21e56fa minetest: fix build on darwin 2022-10-11 13:51:05 +02:00
github-actions[bot] 5d957f3dba
Merge staging-next into staging 2022-10-11 00:05:26 +00:00
Zhaofeng Li 205e805d51 steam: Add extraArgs to prepend arguments to Steam
The steam launcher script in SteamOS 3 always prepends `-steamdeck`
to ensure the correct client version is used. This argument enables
us to replicate the setup in NixOS.
2022-10-10 19:34:20 -04:00
Martin Weinelt 294201004f Merge remote-tracking branch 'origin/master' into staging-next 2022-10-10 21:45:18 +02:00
R. Ryantm 3f2a81f1ba fheroes2: 0.9.19 -> 0.9.20 2022-10-10 19:24:59 +00:00
Christian Kögler 5ffc327413
Merge pull request #192594 from r-ryantm/auto-update/augustus
augustus: 3.1.0 -> 3.2.0
2022-10-10 17:34:17 +02:00
Bobby Rong 6eacf7daeb
Merge pull request #195108 from oxzi/openrct2-0.4.2
openrct2: 0.4.1 -> 0.4.2
2022-10-10 22:15:16 +08:00
Artturin 7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Artturin f4ea1208ec treewide: *Flags convert to list from str
*Flags implies a list

slightly relevant:
> stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172

the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so
it's not a breaking change
2022-10-10 15:30:59 +03:00
Franz Pletz 8dde32e414
snis: fix build with libxcrypt 2022-10-09 18:10:43 +02:00
github-actions[bot] efe8ad8714
Merge master into staging-next 2022-10-09 06:04:00 +00:00
Mario Rodas b8b843e658
Merge pull request #194577 from r-ryantm/auto-update/ferium
ferium: 4.1.11 -> 4.2.0
2022-10-08 19:19:53 -05:00
github-actions[bot] d2cd24fe6a
Merge master into staging-next 2022-10-08 18:01:07 +00:00
Alvar Penning 05962d95f7 openrct2: 0.4.1 -> 0.4.2 2022-10-08 19:06:23 +02:00
Bobby Rong 1f7c106775
Merge pull request #191471 from leifhelm/factorio
factorio: 1.1.65 -> 1.1.69
2022-10-08 21:56:11 +08:00
Vladimír Čunát 6565abc264
Merge branch 'master' into staging-next 2022-10-08 10:20:07 +02:00
Sergei Trofimovich d55a67404f astromenace: use xorg.* packages directly instead of xlibsWrapper indirection
While at it added optional libXinerama depend.
2022-10-08 07:59:33 +01:00
Bobby Rong 73ad1fdaad
Merge pull request #194804 from nagy/2048
_2048-in-terminal: unstable-2021-09-12 -> unstable-2022-06-13
2022-10-08 14:15:50 +08:00
Dennis Felsing 52d6c0ebe7
ddnet: Update homepage
See 8526d50724
2022-10-08 00:15:16 +08:00
Daniel Nagy 0580c5809a
_2048-in-terminal: unstable-2021-09-12 -> unstable-2022-06-13 2022-10-06 22:34:41 +02:00
Daniel Nagy a8ba09146c
sienna: 1.0c -> 1.0d 2022-10-06 22:29:21 +02:00
R. Ryantm 3ad46d4bda ferium: 4.1.11 -> 4.2.0 2022-10-05 11:03:48 +00:00
Daniel McCarney deed43a725 blightmud: remove unused derivation arg. 2022-10-04 20:46:52 -04:00
Daniel McCarney aa88e214ef blightmud: apply nixpkgs-format
For consistency, this commit runs the Blightmud derivation through
`nixpkgs-format`.
2022-10-04 20:33:55 -04:00
Daniel McCarney 450e7db066 blightmud: use rustPlatform.bindgenHook
By using `rustPlatform.bindgenHook` as a `nativeBuildInput` the
Blightmud derivation's custom LIBCLANG_PATH and preBuild step can be
removed outright. See the languages frameworks Rust hooks docs[0] for
more information.

[0]: https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/rust.section.md#hooks-hooks
2022-10-04 20:33:21 -04:00
Martin Weinelt 253ca4957d Merge remote-tracking branch 'origin/master' into staging-next 2022-10-05 00:44:16 +02:00
superherointj 2380304ae4
Merge pull request #193803 from superherointj/broken-adom
adom: mark broken
2022-10-04 12:46:06 -03:00
Lassulus 177554c0a1
Merge pull request #194285 from bandithedoge/master 2022-10-04 11:29:38 +02:00
R. Ryantm b7a6fde153 ferium: 4.1.10 -> 4.1.11 2022-10-04 16:17:53 +08:00
bandithedoge 128f745fff gzdoom: fix IWAD selection menu 2022-10-03 22:09:18 +02:00
bandithedoge 3e117af149 gzdoom: fix libfluidsynth not loading 2022-10-03 22:09:18 +02:00
Aidan Gauland 1abe038db9
heroic: Repackage from source and wrap in FHS
* Instead of using the prebuilt AppImage, build from source and wrap with
  Electron from nixpkgs.

* Wrap in FHS user environment with buildFHSUserEnvBubblewrap.

* Correct meta.description to mention GOG support.

* Simplify meta attribute

* Update maintainers.
  Taking over sole maintainership from wolfanguakang.

* Use gogdl and legendary-gl from nixpkgs
2022-10-04 08:25:54 +13:00
Guanpeng Xu adfb6598af sil-q: use .sil-q to avoid clashing with sil's data 2022-10-03 18:14:47 +08:00
Aidan Gauland d63d265c4e
gogdl: init at 0.3 2022-10-03 16:42:40 +13:00
github-actions[bot] 74f2e36035
Merge master into staging-next 2022-10-03 00:04:07 +00:00
Ivv 1a958fae46
Merge pull request #193033 from corngood/dotnet-deterministic-fetch-deps
dotnet: fix some problems with nuget-to-nix and make it deterministic
2022-10-02 21:31:01 +02:00
David McFarland 9e0a1e7b8e dotnet: update lock files of packages using nuget-to-nix 2022-10-02 16:09:27 -03:00
github-actions[bot] 532efa8827
Merge master into staging-next 2022-10-02 06:05:57 +00:00
R. Ryantm e19150be4f vintagestory: 1.16.5 -> 1.17.4 2022-10-01 03:52:48 +00:00
R. Ryantm 86d941c4f4 terraria-server: 1.4.3.6 -> 1.4.4.2 2022-10-01 02:32:53 +00:00
superherointj 5a012749d5 adom: mark broken 2022-09-30 22:04:25 -03:00
github-actions[bot] bc5e570733
Merge master into staging-next 2022-09-30 12:01:29 +00:00
Peter Hoeg baf2e6d069 gemrb: 0.9.0 -> 0.9.1 2022-09-30 17:39:58 +08:00
Morgan Wolfe da4cf04fad pysolfc: 2.6.4 -> 2.16.0
PySolFC 2.6.4 does not build on python >= 3.8. Ten minor versions' worth
of release notes is otherwise too large to fit here.
2022-09-29 10:12:20 -07:00
github-actions[bot] 9c14978f84
Merge master into staging-next 2022-09-29 12:01:25 +00:00
Weijia Wang 870d6f4a98 licenses: remove gpl1 2022-09-29 10:54:21 +02:00
Vladimír Čunát 8ba120420f
Merge #191339: staging-next 2022-09-15 2022-09-29 09:16:47 +02:00
Sandro 2c7053727d
Merge pull request #192657 from atemp/emp_ddnet_16.4 2022-09-29 00:45:04 +02:00
Martin Weinelt d3d949d15c
Merge pull request #192812 from danth/0ad-26 2022-09-28 20:12:42 +02:00
github-actions[bot] f18d801779
Merge staging-next into staging 2022-09-28 18:05:53 +00:00
github-actions[bot] d2b7f4ad5f
Merge master into staging-next 2022-09-28 18:05:16 +00:00
usrfriendly f0de0cf811 enyo-launcher: 2.0.2 -> 2.0.5, renamed from enyo-doom 2022-09-28 09:55:15 -07:00
github-actions[bot] d6a1c7033e
Merge staging-next into staging 2022-09-28 00:06:37 +00:00
github-actions[bot] 70776ac218
Merge master into staging-next 2022-09-28 00:06:02 +00:00
Artturi 1c1c182814
Merge pull request #192851 from Artturin/treewides1 2022-09-28 00:50:06 +03:00
ajs124 b9d8109dd6
Merge pull request #190328 from necessarily-equal/unvanquished-0.53.2
unvanquished: 0.53.1 -> 0.53.2
2022-09-27 22:45:44 +02:00
github-actions[bot] 8d941befdb
Merge staging-next into staging 2022-09-27 18:04:48 +00:00
github-actions[bot] 3f66160994
Merge master into staging-next 2022-09-27 18:04:13 +00:00
Franz Pletz 4b59241771
Merge pull request #193150 from fgaz/minetest/5.6.1
minetest: 5.6.0 -> 5.6.1, cleanup, add fgaz to maintainers
2022-09-27 18:19:31 +02:00
Francesco Gazzetta 8c6f018766 minetest: update outdated broken expression 2022-09-27 11:29:49 +02:00
Francesco Gazzetta 2819931e41 minetest: add fgaz to maintainers 2022-09-27 09:47:40 +02:00
Francesco Gazzetta aee300a6b5 minetest: 5.6.0 -> 5.6.1 2022-09-27 09:47:21 +02:00
github-actions[bot] d645d61d7a
Merge staging-next into staging 2022-09-27 00:07:09 +00:00
github-actions[bot] 088eead34a
Merge master into staging-next 2022-09-27 00:06:31 +00:00
Sergei Trofimovich 30133410c9
Merge pull request #192721 from trofi/ddx-rebirth-gcc-fix
ddx-rebirth: 0.59.20200202 -> unstable-2022-09-17
2022-09-26 21:34:06 +01:00
Artturin 0734f54ef2 treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs
found with nixpkgs-lint
2022-09-26 17:53:26 +03:00
Frederik Rietdijk 63e480ba16 Merge staging-next into staging 2022-09-26 09:31:50 +02:00
Frederik Rietdijk de57d754a0 Merge master into staging-next 2022-09-26 09:31:22 +02:00
github-actions[bot] e0bea8e017
Merge staging-next into staging 2022-09-26 00:03:58 +00:00
Martin Weinelt d2713c3294
anki: build with format other 2022-09-25 23:49:37 +02:00
Martin Weinelt 44b6c02937
Merge pull request #189799 from r-ryantm/auto-update/unciv 2022-09-25 21:41:15 +02:00
R. Ryantm 9460046dbf unciv: 4.2.6 -> 4.2.11 2022-09-25 18:50:23 +00:00
Daniel Thwaites 80bd40cd9d
zeroad: 0.0.25b -> 0.0.26 2022-09-24 23:37:48 +01:00
R. Ryantm d77812e649 quakespasm: 0.94.7 -> 0.95.0 2022-09-24 16:36:39 +08:00
Sergei Trofimovich c6b52733b8 ddx-rebirth: 0.59.20200202 -> unstable-2022-09-17
Fixes build by switching to default compiler.
While at it moved over to SDL2.
2022-09-24 08:39:33 +01:00
superherointj 19a4cf250e
Merge pull request #192635 from mweinelt/openra-python3
openra: use python3
2022-09-23 16:59:04 -03:00
Heinz Deinhart eb1d06ea70 ddnet: 16.3.2 -> 16.4 2022-09-23 20:31:30 +02:00
ckie 85de8ecb48
Merge pull request #190682 from cpu/cpu-init-ldmud-3.6.6
ldmud: init at 3.6.6
2022-09-23 19:03:25 +03:00
Martin Weinelt 47f3427ce4
openra: use python3 2022-09-23 17:35:09 +02:00