colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
422,221 Commits 126 Branches 0 Tags 3.2 GiB
b4530d1ed4
Commit Graph

6367 Commits

Author SHA1 Message Date
Sergei Trofimovich
4cef88b852 openrw: use xorg.* packages directly instead of xlibsWrapper indirection 
Tested as no material change in `out` output with `diffoscope`.
 2022-10-30 11:19:50 +01:00
Sergei Trofimovich
711bc5f86c zoom: use xorg.* packages directly instead of xlibsWrapper indirection 
Tested as no material change in `out` output with `diffoscope`.
 2022-10-29 12:15:14 +02:00
Sergei Trofimovich
38164d1660
Merge pull request #198115 from trofi/fheroes2-use-gitUpdate 
fheroes2: switch to gitUpdater to avoid non-version tags
 2022-10-28 14:24:53 +01:00
Mario Rodas
82051748eb
Merge pull request #194204 from herberteuler/fix/sil-q-user-dir 
sil-q: use .sil-q to avoid clashing with sil's data
 2022-10-28 07:54:54 -05:00
Sergei Trofimovich
bcfe4b4009 fheroes2: switch to gitUpdater to avoid non-version tags 
`gitUpdater` uses common updater that uses only versioned tags as input.
It also supports version ignore ranges if needed.

Without the change updater tries to pul in `fheroes-android` non-release:
  https://github.com/NixOS/nixpkgs/pull/198000
 2022-10-27 19:57:34 +01: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
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
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