JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
312,944 Commits 2 Branches 0 Tags 12 GiB
a442e572cb
Commit Graph

4829 Commits

Author SHA1 Message Date
R. RyanTM
8b7e73ddb0 cbonsai: 1.2.0 -> 1.2.1 2021-06-29 03:17:03 +00:00
R. RyanTM
6b06737e5a katago: 1.8.2 -> 1.9.0 2021-06-29 00:12:50 +00:00
github-actions[bot]
dcfd9788a1
Merge master into staging-next 2021-06-29 00:10:52 +00:00
Sandro
7b4dfb1a88
Merge pull request #127823 from Stunkymonkey/games-pname 2021-06-28 23:39:30 +02:00
github-actions[bot]
c04f4806d3
Merge staging-next into staging 2021-06-27 18:05:17 +00:00
legendofmiracles
189a6ba91d
rpg-cli: 0.4.1 -> 0.5.0 2021-06-27 00:20:53 -06:00
Peter Hoeg
14ec3c0a82 gemrb: vlc is only needed on mac 2021-06-27 14:04:02 +08:00
R. RyanTM
cfd6ef75c3 extremetuxracer: 0.8.0 -> 0.8.1 2021-06-27 02:13:23 +00:00
github-actions[bot]
8f71a7f335
Merge staging-next into staging 2021-06-26 18:04:40 +00:00
necessarily-equal
f5bba23a7b
unvanquished: 0.52.0 -> 0.52.1 (#127771) 2021-06-26 17:48:49 +02:00
Felix Buehler
ce3b463c79 games: /s/name/pname&version/ 2021-06-25 01:28:10 +02:00
github-actions[bot]
14f789f9e5
Merge staging-next into staging 2021-06-23 12:04:29 +00:00
Sandro
0ba004e97d
Merge pull request #127885 from SuperSandro2000/SuperSandro2000-patch-1 
orthorobot: remove phases overwrite
 2021-06-23 13:43:33 +02:00
Sandro
039b2deca5
orthorobot: remove phases overwrite 2021-06-23 12:59:57 +02:00
Sandro
cab0b546a3
Merge pull request #127456 from musfay/multimc-fix 2021-06-23 10:44:50 +02:00
github-actions[bot]
64eb8c173d
Merge staging-next into staging 2021-06-23 00:09:37 +00:00
Mustafa Çalışkan
3fd5108780 multimc: hardcode jdk paths and use latest jdk by default 2021-06-22 22:00:51 +03:00
Sandro
192a85e425
Merge pull request #127759 from peterhoeg/u/widelands 
widelands: 21 -> 1.0
 2021-06-22 16:15:53 +02:00
github-actions[bot]
b766664645
Merge staging-next into staging 2021-06-22 12:05:04 +00:00
Sandro
cb86e4e62f
Merge pull request #127397 from Artturin/add-grapejuice 
grapejuice: init at 3.11.4
 2021-06-22 10:12:00 +02:00
Peter Hoeg
56f2a77584 widelands: 21 -> 1.0 
Also add a few missing bits (icons, man page)
 2021-06-22 14:09:48 +08:00
Artturin
09a52f7662 grapejuice: init at 3.11.4 2021-06-22 04:52:16 +03:00
github-actions[bot]
1df79d27a7
Merge staging-next into staging 2021-06-22 00:07:12 +00:00
Mustafa Çalışkan
46c373b5e5 multimc: 0.6.12 -> unstable-2021-06-21 2021-06-21 20:54:40 +03:00
Peter Hoeg
4d66930f13
gemrb: 0.8.7 -> 0.9.0 (#127631) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-06-21 13:53:18 +02:00
github-actions[bot]
6907a1af10
Merge staging-next into staging 2021-06-20 06:07:51 +00:00
github-actions[bot]
a4a610bdee
Merge master into staging-next 2021-06-20 06:07:48 +00:00
Luke Granger-Brown
756233bf00
Merge pull request #127491 from nbraud/factorio 
factorio: 1.1.34 → 1.1.35
 2021-06-20 01:18:51 +01:00
nicoo
e5baf82e87 factorio: 1.1.34 → 1.1.35 2021-06-19 21:16:15 +02:00
nicoo
5e06828dff factorio: Fix bug in update.py 
Prior to this change, `update.py` fails with `KeyError: 'alpha'` when upstream
does not have a version in the `experimental` channel:

	./update.py --username XXXXXXXX --token "$(wl-paste)"
	Traceback (most recent call last):
	  File "./update.py", line 180, in <module>
	    app.run(main)
	  File "/nix/store/854z51wg8fj1s6ghxasp1xxx8khb3r8v-python3-3.8.9-env/lib/python3.8/site-packages/absl/app.py", line 303, in run
	    _run_main(main, args)
	  File "/nix/store/854z51wg8fj1s6ghxasp1xxx8khb3r8v-python3-3.8.9-env/lib/python3.8/site-packages/absl/app.py", line 251, in _run_main
	    sys.exit(main(argv))
	  File "./update.py", line 162, in main
	    new_our_versions = generate_our_versions(factorio_versions)
	  File "./update.py", line 92, in generate_our_versions
	    version = factorio_versions[release_channel.name][release_type.name]
	KeyError: 'alpha'

I chose to make it so that the versions in nixpkgs' `factorio-*` packages are
either experimental (when available) or stable, as this seems like the most
coherent approach
 2021-06-19 21:15:44 +02:00
github-actions[bot]
ea28ef6cc7
Merge staging-next into staging 2021-06-18 12:04:59 +00:00
github-actions[bot]
dd892e7e2f
Merge master into staging-next 2021-06-18 12:04:55 +00:00
Sandro
381fd6994c
Merge pull request #127190 from McSinyx/blackshades-1.1.1 2021-06-18 10:36:10 +02:00
Sandro
53b46ef5b1
Merge pull request #127252 from SuperSandro2000/expect 2021-06-18 02:42:20 +02:00
Sandro Jäckel
8d6ca95ea7
scid: add todo comments 2021-06-17 20:43:01 +02:00
Nguyễn Gia Phong
60ac7d2b58
blackshades: svn-110 -> 1.1.1 2021-06-17 15:03:18 +07:00
github-actions[bot]
538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot]
51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Jonathan Ringer
08581dc64c
dwarf-therapist: 41.1.5 -> 41.2.2 2021-06-16 13:36:04 -07:00
github-actions[bot]
8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
github-actions[bot]
2d104c99a7
Merge master into staging-next 2021-06-16 18:04:45 +00:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
 2021-06-16 19:59:05 +02:00
Jakub Kądziołka
fa9f6b9e1b
osu-lazer: 2021.602.0 -> 2021.612.0 2021-06-16 16:03:16 +02:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
 2021-06-15 11:19:41 +02:00
legendofmiracles
cd68c94996
rpg-cli: 0.4.0 -> 0.4.1 2021-06-14 14:14:59 -06:00
Sandro
14f42ee031
Merge pull request #126647 from necessarily-equal/unvanquished 
unvanquished: workaround NVidia proprietary driver bug
 2021-06-14 20:05:32 +02:00
github-actions[bot]
3501b20658
Merge staging-next into staging 2021-06-13 06:04:51 +00:00
github-actions[bot]
ec4b7ebf86
Merge master into staging-next 2021-06-13 06:04:48 +00:00
Matthieu Coudron
e0b13fe95b sauerbraten: set mainProgram to sauerbraten_client 
so that nix run nixpkgs#sauerbraten starts the game
 2021-06-13 00:49:02 +02:00
Antoine Fontaine
bce8f178d8 unvanquished: workaround NVidia proprietary driver bug 2021-06-12 11:40:14 +02:00
Alyssa Ross
926765c5e3
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/servers/http/apache-httpd/2.4.nix
 2021-06-11 02:05:00 +00:00
github-actions[bot]
dcfc502458
Merge master into staging-next 2021-06-11 00:09:47 +00:00
Sandro
a3b7038a70
Merge pull request #126414 from petabyteboy/feature/update-alienarena 
alienarena: 7.65 -> 7.71.2
 2021-06-10 21:10:03 +02:00
Jan Tojnar
ba733d435b
Merge branch 'staging-next' into staging 2021-06-10 14:07:45 +02:00
R. RyanTM
2ca769ad02 gemrb: 0.8.7 -> 0.8.8 2021-06-10 17:21:57 +08:00
github-actions[bot]
da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres
0b045a37fc Change all alsaPlugins references to alsa-plugins 
Also, refactor alsa-plugins to make it more readable.
 2021-06-10 01:36:35 -03:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Milan Pässler
d5df1b0f5d
alienarena: 7.65 -> 7.71.2 2021-06-10 01:11:47 +02:00
Martin Weinelt
3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
Sandro
ae18d436e5
Merge pull request #126215 from fgaz/shattered-pixel-dungeon/0.9.3 
shattered-pixel-dungeon: 0.9.2b -> 0.9.3
 2021-06-09 13:30:13 +02:00
Sandro
14e6e83b60
Merge pull request #125904 from legendofmiracles/update/rpg-cli 
rpg-cli: 0.3.0 -> 0.4.0
 2021-06-09 12:42:31 +02:00
Alyssa Ross
013d3cb42d xsnow: 1.42 -> 3.3.0 
Since this package was last updated, xsnow has been relicensed, and
then forked.  It's also had its build system replaced.
 2021-06-09 10:21:20 +00:00
github-actions[bot]
b61efd9db1
Merge master into staging-next 2021-06-09 00:09:07 +00:00
Peter Simons
51bb9f3e9a minecraft-server: 1.16.5 -> 1.17 2021-06-08 14:17:06 -04:00
github-actions[bot]
e8f8906d68
Merge master into staging-next 2021-06-08 18:16:27 +00:00
Sandro
4ebc8bcf01
Merge pull request #126133 from ZerataX/papermc 2021-06-08 17:57:13 +02:00
Jonathan Ringer
e6903f1e94 steam/fhsenv: add pipewire as hard requirement 2021-06-08 08:51:18 -07:00
Francesco Gazzetta
9306fb9f3d shattered-pixel-dungeon: 0.9.2b -> 0.9.3 2021-06-08 16:21:41 +02:00
github-actions[bot]
89746ce131
Merge master into staging-next 2021-06-08 06:12:14 +00:00
Artturin
2033f37fb2 steamPackages.steam-runtime: 0.20210317.0 -> 0.20210527.0 2021-06-08 03:47:26 +03:00
ZerataX
b2c045c07b
papermc: 1.16.5r488 -> 1.16.5r771 2021-06-08 00:59:38 +02:00
github-actions[bot]
6076dbb085
Merge master into staging-next 2021-06-06 12:14:32 +00:00
Peter Simons
c850d5a550
Merge pull request #125837 from r-burns/stockfish 
stockfish: 12 -> 13
 2021-06-06 09:10:10 +02:00
legendofmiracles
1aefc955f7
rpg-cli: 0.3.0 -> 0.4.0 2021-06-05 23:45:14 -06:00
github-actions[bot]
51ecdeca84
Merge master into staging-next 2021-06-06 00:15:19 +00:00
Sandro
5e852ca257
Merge pull request #125692 from fgaz/tumiki-fighters/init 
tumiki-fighters: init at 0.21
 2021-06-06 01:49:44 +02:00
Sandro
7935dbda8a
Merge pull request #125651 from fgaz/torus-trooper/init 
torus-trooper: init at 0.22
 2021-06-05 23:40:47 +02:00
Sandro
abcf2ce8e0
Merge pull request #125828 from musfay/lunar 2021-06-05 23:27:40 +02:00
Francesco Gazzetta
3a9b42c07e tumiki-fighters: init at 0.21 2021-06-05 21:23:35 +02:00
Francesco Gazzetta
7c1a214125 torus-trooper: init at 0.22 2021-06-05 21:22:14 +02:00
Ryan Burns
68f8c1fc66 stockfish: 12 -> 13 2021-06-05 12:18:53 -07:00
Sandro
929c876f65
Merge pull request #125654 from karolchmist/init-fheroes2-0.9.4 
fheroes2: init at 0.9.4
 2021-06-05 20:45:29 +02:00
github-actions[bot]
d9d6f71e43
Merge master into staging-next 2021-06-05 18:30:28 +00:00
Mustafa Çalışkan
22e0fe2f29
lunar-client: 2.6.0 -> 2.7.3 2021-06-05 21:09:53 +03:00
github-actions[bot]
ad63c3d31f
Merge master into staging-next 2021-06-04 19:40:59 +00:00
Karol Chmist
e1b8ef38ea fheroes2: init at 0.9.4 2021-06-04 20:44:07 +02:00
Antoine Fontaine
758c87007c unvanquished: init at 0.52.0 2021-06-04 17:48:46 +02:00
oxalica
24c6e52af8
osu-lazer: 2021.515.0 -> 2021.602.0 2021-06-04 20:01:22 +08:00
github-actions[bot]
a9f286f5cf
Merge master into staging-next 2021-06-03 19:52:02 +00:00
polygon
388bc58b7f
liquidwar: fix build (#125480) 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-06-03 16:36:26 +02:00
github-actions[bot]
a12e0d5bff
Merge master into staging-next 2021-06-03 12:49:11 +00:00
Sandro Jäckel
89d5f4b3d0
treewide: setuptools_scm -> setuptools-scm 2021-06-03 12:44:33 +02:00
Sandro
9a5a639608
Merge pull request #125006 from astro/frogatto 2021-06-03 12:03:00 +02:00
github-actions[bot]
1fe3553272
Merge master into staging-next 2021-06-03 02:08:32 +00:00
Luke Granger-Brown
7876162722 factorio-demo: 1.1.32 -> 1.1.34 2021-06-02 18:32:28 +00:00
Luke Granger-Brown
266fa7f015 factorio-experimental: 1.1.33 -> 1.1.34 2021-06-02 18:31:23 +00:00
Luke Granger-Brown
e5173c8481 factorio: 1.1.32 -> 1.1.34 2021-06-02 18:30:25 +00:00
Astro
39a9499774 frogatto: unstable-2021-05-24 -> unstable-2018-12-18, unbreak 2021-06-02 19:21:38 +02:00
github-actions[bot]
1176851146
Merge master into staging-next 2021-06-02 07:51:53 +00:00
Ryan Mulligan
1848d4270a
Merge pull request #125023 from r-ryantm/auto-update/ckan 
ckan: 1.30.2 -> 1.30.4
 2021-06-01 20:37:17 -07:00
github-actions[bot]
42b70ad7f1
Merge master into staging-next 2021-06-01 20:30:45 +00:00
Sandro
c7aece5a48
Merge pull request #125245 from rnhmjoj/warzone 
warzone2100: fix build
 2021-06-01 20:15:18 +02:00
rnhmjoj
302d6b1b8b
warzone2100: fix build 
I'm not sure how the build broke[1] or how it worked before, but
the problem is zip is being used in place of p7zip, which obviously
fail as the flags have different meanings.

[1]: https://hydra.nixos.org/build/143354937
 2021-06-01 17:54:10 +02:00
github-actions[bot]
7f14676873
Merge master into staging-next 2021-05-31 19:44:13 +00:00
R. RyanTM
fe414b367d cbonsai: 1.1.1 -> 1.2.0 2021-05-31 10:58:03 +00:00
R. RyanTM
a57fcabd33 ckan: 1.30.2 -> 1.30.4 2021-05-31 01:49:11 +00:00
github-actions[bot]
2867d5301f
Merge master into staging-next 2021-05-30 19:15:10 +00:00
Sandro
58a2737645
Merge pull request #124981 from legendofmiracles/rpg 
rpg-cli: unstable-2021-05-27 -> 0.3.0
 2021-05-30 19:57:52 +02:00
legendofmiracles
e546f97664
rpg-cli: unstable-2021-05-27 -> 0.3.0 2021-05-30 11:13:15 -06:00
github-actions[bot]
4fd76aacd3
Merge master into staging-next 2021-05-30 01:54:11 +00:00
Karl Meakin
6ee94fc354 runelite: 2.0.0 -> 2.1.5 2021-05-29 16:11:41 -07:00
github-actions[bot]
4cfefea5b2
Merge master into staging-next 2021-05-29 01:43:58 +00:00
Sandro
c95522aac2
Merge pull request #124685 from greaka/patch-1 
terraria-server: 1.4.2.2 -> 1.4.2.3
 2021-05-29 02:57:53 +02:00
Sandro
3e69f71e77
Merge pull request #124539 from legendofmiracles/rpg 
rpg-cli: init at 0.2.0
 2021-05-29 02:29:27 +02:00
Sandro
5730083206
Merge pull request #124195 from atopuzov/augustus-3.0.1 2021-05-29 02:09:03 +02:00
R. RyanTM
262658cca8 cbonsai: 1.0.4 -> 1.1.1 2021-05-28 10:51:27 +00:00
github-actions[bot]
a743ebe846
Merge master into staging-next 2021-05-27 18:58:59 +00:00
greaka
4e9bd87f5a
terraria-server: 1.4.2.2 -> 1.4.2.3 2021-05-27 19:34:05 +02:00
Ryan Mulligan
ea595a2013
Merge pull request #124021 from r-ryantm/auto-update/cdogs 
cdogs-sdl: 0.11.1 -> 0.12.0
 2021-05-27 06:05:31 -07:00
github-actions[bot]
f385b431a7
Merge master into staging-next 2021-05-27 06:45:59 +00:00
legendofmiracles
bfcd6bd009
rpg-cli: init at 0.2.0 2021-05-27 00:40:07 -06:00
Stéphan Kochen
2353879e8d toppler: fix darwin build 2021-05-26 18:17:40 +02:00
Aleksandar Topuzović
b5a50d1486
augustus: 2.0.1 -> 3.0.1 2021-05-23 21:22:29 +01:00
github-actions[bot]
2aa5735c09
Merge master into staging-next 2021-05-23 18:33:25 +00:00
Sandro
ebd5042606
Merge pull request #124041 from fgaz/shattered-pixel-dungeon/0.9.2b 2021-05-23 17:03:28 +02:00
Jonathan Ringer
b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next 2021-05-22 19:23:14 -07:00
R. RyanTM
49b89bb8f0 alephone-marathon: 20200904 -> 20210408 2021-05-23 02:13:52 +00:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/tools/networking/xh/default.nix
 2021-05-22 18:19:10 -07:00
Francesco Gazzetta
fc8eefe2fe shattered-pixel-dungeon: 0.9.2 -> 0.9.2b 2021-05-22 18:13:12 +02:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Sandro
b182609952
Merge pull request #114692 from r-ryantm/auto-update/chessx 
chessx: 1.5.0 -> 1.5.6
 2021-05-22 15:20:31 +02:00
R. RyanTM
51f861a25c cdogs-sdl: 0.11.1 -> 0.12.0 2021-05-22 11:50:52 +00:00
github-actions[bot]
d5714df652
Merge staging-next into staging 2021-05-22 06:21:58 +00:00
Jonathan Ringer
7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
 2021-05-21 19:49:05 -07:00
R. RyanTM
c7be0f932d ckan: 1.30.0 -> 1.30.2 2021-05-21 19:43:41 -07:00
Andrew Brooks
a49a274abf Revert "xconq: Simplify package with tcl.tclPackageHook" 
This reverts commit 113826a892512eb2e19985310fd7d4a39db4d75e, which
ended up breaking the Tk import at runtime.
 2021-05-21 15:18:25 -05:00
Andrew Brooks
17a561e1cf scid: Correct typo in maintainers 2021-05-21 15:18:24 -05:00
Andrew Brooks
c677478b0b scid-vs-pc: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:13 -05:00
Andrew Brooks
9979565b0c scid: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:12 -05:00
Andrew Brooks
a4f54890d5 xconq: Simplify package with tcl.tclPackageHook 2021-05-21 15:18:11 -05:00
Andrew Brooks
f17ca3f517 tcl2048: Simplify package with tcl.mkTclDerivation 2021-05-21 15:18:11 -05:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
 2021-05-20 22:11:42 -07:00
Martin Weinelt
dfe77a81af
Merge pull request #123180 from zeri42/zod-version-bump 2021-05-20 22:19:11 +02:00
github-actions[bot]
34a05e29f1
Merge master into staging-next 2021-05-20 18:36:00 +00:00
Profpatsch
c8c7d0c448 ultrastardx: really don’t use ffmpeg_3 
Due to a merge error, usdx didn’t actually switch to ffmpeg 4.
This fixes that
 2021-05-20 19:38:54 +02:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
 2021-05-20 09:12:42 -07:00
zeri42
a75e32a0d0 zod: add scaling factor 
- add patch that allows to resize the zod_launcher window at compile
 time with `scalingFactor` option
 2021-05-20 12:44:02 +02:00
zeri42
1d58c8b095 zod: 2011-03-18 -> 2011-09-06 
- cleanup Derivation
- add map_editor and zod_launcher
- game is playable now (appears broken/orphaned in current version)
- fix comment about version
- add enableParallelBuilding=true;
- change source url to use mirror://
 2021-05-20 12:44:02 +02:00
Peter Hoeg
7fe78d4f9e openmw-tes3mp: unstable-2019-11-19 -> unstable-2020-08-07 2021-05-20 09:06:25 +08:00
Peter Hoeg
5c87334112 openmw: ffmpeg_3 -> ffmpeg 2021-05-20 09:06:25 +08:00
Reed
029d53dbf9 r2mod_cli: 1.0.7 -> 1.2.0 2021-05-19 12:39:26 -07:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
 2021-05-18 08:57:16 -07:00
Vladimír Čunát
e3088f6793
Merge #123483: privateer: drop, broken for years 2021-05-18 12:13:20 +02:00
Robert Schütz
0b7ebd1b51 privateer: drop 
It was marked as broken in August 2015.
 2021-05-18 11:59:54 +02:00
Sandro
32fd19653c
Merge pull request #123468 from Atemu/update/anki-bin 
anki-bin: 2.1.43 -> 2.1.44
 2021-05-18 11:49:58 +02:00
Profpatsch
d7cfce0e47 ultrastardx: 2020.4.0 -> 2021-04-03 
Not a lot has changed since last update, a few fixes were pushed to
the master tree.
We take the liberty to update to master for now.

This updates the ffmpeg version from 2.x to 4.x, which seems to be
supported upstream when we bend the minor version restriction a
little.
A simple karaoke song played just fine in my test.
 2021-05-18 09:04:32 +02:00
Martin Weinelt
707234bf0d steam: add json-glib to fhsenv 
Fixes the Paradox Launcher for Stellaris.

Fixes: #123447
 2021-05-17 23:19:33 -07:00
OPNA2608
fc2e0709f0 openxray: 784-october-preview -> 822-december-preview 2021-05-17 20:21:04 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next 
Fix cargo-flash build
 2021-05-16 18:27:14 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah 
treewide: remove gnidorah
 2021-05-17 02:42:24 +02:00
Sandro
65e349506f
Merge pull request #122837 from cyberdront/patch-1 
terraria-server: 1.4.1.2 -> 1.4.2.2
 2021-05-17 02:27:57 +02:00
Sandro
622c2c2382
Merge pull request #122994 from mweinelt/remove-inactive-maintainer/nand0p 
treewide: remove nand0p as maintainer
 2021-05-17 02:18:03 +02:00
Sandro
b2cd6ba7f5
Merge pull request #123275 from oxalica/osu 
osu-lazer: 2021.502.0 -> 2021.515.0
 2021-05-17 02:06:17 +02:00
Martin Weinelt
7bd65d54f7 treewide: remove nand0p as maintainer 
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
 2021-05-17 01:50:49 +02:00
Michael Raskin
5e9437ef57
Merge pull request #123289 from OPNA2608/fix/supertuxkart-darwin/21.05 
superTuxKart: Build on Darwin
 2021-05-16 22:59:10 +00:00
sophrosyne97
1372b429cc cataclysm-dda-git: 2019-11-22 -> 2020-12-09 2021-05-16 15:44:54 -07:00
OPNA2608
f2a29c1ee9 superTuxKart: Make Darwin-compatible 2021-05-16 22:24:34 +02:00
oxalica
cf1db5812d
osu-lazer: 2021.502.0 -> 2021.515.0 2021-05-17 02:57:46 +08:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
Stéphan Kochen
5ed1f1f2a6 frotz: fix darwin build 2021-05-15 14:18:41 +02:00
Marat
ad96c7eb13 terraria-server: 1.4.1.2 -> 1.4.2.2 2021-05-14 13:25:29 +04:00
Atemu
e2b86ad1e7 anki-bin: 2.1.43 -> 2.1.44 2021-05-13 17:31:54 +02:00
Jan Tojnar
0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00
Sandro
b3186b9860
Merge pull request #122657 from malob/0verkill-darwin-fix 
0verkill: fix darwin build
 2021-05-12 23:13:12 +02:00
Sandro
88df2cb177
Merge pull request #122765 from legendofmiracles/steam-tui 
steam-tui: adds missing runtime dependencies correctly
 2021-05-12 22:59:33 +02:00
legendofmiracles
65380bc338
steam-tui: adds missing runtime dependencies 2021-05-12 14:30:50 -06:00
github-actions[bot]
b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Malo Bourgon
9b03a74fb5 0verkill: fix darwin build 2021-05-12 10:01:12 -07:00
Sandro
d2d634c6ca
Merge pull request #122699 from legendofmiracles/steam-tui 
steam-tui: init at 0.1.0
 2021-05-12 17:29:00 +02:00
legendofmiracles
7dd35786f3
steam-tui: init at 0.1.0 2021-05-12 05:53:36 -06:00
github-actions[bot]
e2cf474986
Merge staging-next into staging 2021-05-12 06:21:36 +00:00
Peter Hoeg
e1ce68683f freeorion: 0.4.9 -> 0.4.10.1 2021-05-12 09:38:58 +08:00
github-actions[bot]
7ce907b413
Merge staging-next into staging 2021-05-10 12:24:36 +00:00
Lancelot SIX
e612d0e09a gnuchess: 6.2.7 -> 6.2.8 
See https://lists.gnu.org/archive/html/info-gnu/2021-05/msg00006.html
for release information.
 2021-05-10 09:24:02 +01:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
yurkobb
c8f5ce18fa assaultcube licensing: mark unfree 
The license of AssaultCube as a whole is not zlib, it's freeware, see: https://assault.cubers.net/docs/license.html

closes #121381
 2021-05-09 19:33:23 +00:00
Dmitry Kalinkin
9d1ff3bf10
Merge pull request #121911 from SFrijters/openttd-1.11.2 
openttd: 1.11.1 -> 1.11.2
 2021-05-09 00:59:24 -04:00
fricklerhandwerk
10f9d7d2e9 freeciv: build with gtk when gtkClient = true 
the configure flag was missing, and now the `freeciv-gtk3` binary will
be produced.
 2021-05-08 23:38:13 +02:00
OPNA2608
b690ceff5d superTuxKart: Fix aarch64-linux build 2021-05-08 13:52:35 -07:00
Jan Tojnar
dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
Charlotte Van Petegem
b65155098b zeroad: Add myself as a maintainer 2021-05-08 10:53:49 -07:00
Charlotte Van Petegem
701664ea5c zeroad: Split data from binaries again 
The rootdir patch was lost in the update to 0.0.24b. Adding it allows
hydra to build the game. It can't when the binaries depend on the data
since the data is too big for hydra.
 2021-05-08 10:53:49 -07:00
Emery Hemingway
37cac60102 alephone: 1.3.1 -> 1.4 2021-05-08 15:28:09 +02:00
R. RyanTM
362edb1962 alephone-infinity: 20200904 -> 20210408 2021-05-08 10:06:10 +02:00
Jan Tojnar
468cb5980b gnome: rename from gnome3 
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
 2021-05-08 09:47:42 +02:00
Stefan Frijters
282492959e gweled: unstable-2018-02-15 -> unstable-2021-02-11 2021-05-08 00:39:04 -07:00
Daniël de Kok
85f96822a0 treewide: fix cargoSha256/cargoHash 
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
 2021-05-08 00:36:37 -07:00
maralorn
958855d30c
Merge pull request #121627 from NixOS/haskell-updates 2021-05-07 23:55:19 +02:00
Stefan Frijters
62ca25f181 colobot: Fix build 2021-05-07 11:14:40 -07:00
Sandro
fdaa6792e5
Merge pull request #121962 from dotlambda/cutemaze-1.3.0 
cutemaze: 1.2.6 -> 1.3.0
 2021-05-07 16:45:26 +02:00
Malte Brandy
2a11f1f5cc
Merge branch 'master' into haskell-updates 2021-05-07 15:03:54 +02:00
Stefan Frijters
af3425beca
openttd: 1.11.1 -> 1.11.2 2021-05-07 12:25:41 +02:00
Eduardo Sánchez Muñoz
5a389e9fd4 minetest: 5.3.0 -> 5.4.1 2021-05-07 00:03:40 -04:00
Robert Schütz
a8ac0cfa63 cutemaze: 1.2.6 -> 1.3.0 2021-05-07 00:49:49 +02:00
Maximilian Bosch
730ec2ac89
Merge pull request #121851 from mayflower/hedgewars-ffmpeg4 
hedgewars: use ffmpeg 4
 2021-05-06 23:07:27 +02:00
Robert Schütz
bda9e192dd
Merge pull request #120582 from dotlambda/ffmpeg_2-drop 
ffmpeg_2: mark as insecure
 2021-05-06 13:51:34 +02:00
Robin Gloster
0bd501d1dd
hedgewars: use ffmpeg 4 
see #120705
 2021-05-05 16:41:13 -05:00
sternenseemann
977ccbf6bf hedgewars: portability is limited by fpc 2021-05-05 22:45:52 +02:00
Luke Granger-Brown
725468af89 factorio-experimental: 1.1.32 -> 1.1.33 2021-05-04 01:05:21 +00:00
oxalica
935db0c11b
osu-lazer: 2021.410.0 -> 2021.502.0 2021-05-03 15:18:12 +08:00
nixinator
d5a0b50f26 methane: init at 2.0.1 2021-05-02 18:12:31 -07:00
Robert Schütz
ed42bcb6ff ultrastardx: use ffmpeg_3 instead of ffmpeg_2 2021-05-01 10:08:47 +02:00
V
490fa1e891 steamPackages.steam-runtime: 0.20201203.1 -> 0.20210317.0 2021-04-30 14:38:58 -07:00
Sandro
cf467975bf
Merge pull request #120838 from sternenseemann/soldat-unstable-2021-04-27 
soldat-unstable: unstable-2021-02-09 -> unstable-2021-04-27
 2021-04-30 13:56:50 +02:00
reedrw
4b409860c2
shticker-book-unwritten: fix broken cargoSha256; add libXcursor (#120968) 2021-04-30 04:32:32 +02:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah 
due to github account removal/deletion and not other mean of contact.
 2021-04-30 01:48:19 +02:00
Sandro
53793fd109
Merge pull request #120976 from r-ryantm/auto-update/cdogs 
cdogs-sdl: 0.11.0 -> 0.11.1
 2021-04-30 00:56:11 +02:00
R. RyanTM
77a270f871 freeciv: 2.6.3 -> 2.6.4 2021-04-29 00:29:02 -04:00
R. RyanTM
f669f72a56 cdogs-sdl: 0.11.0 -> 0.11.1 2021-04-28 04:57:32 +00:00
sternenseemann
712f49a053 soldat-unstable: unstable-2021-02-09 -> unstable-2021-04-27 2021-04-27 16:56:51 +02:00
Robin Townsend
78f77869b9 Revert "minecraft-launcher: 2.2.1441 -> 2.2.741" 
This reverts commit dabfce650a, since it
downgraded minecraft-launcher to an older version.
 2021-04-26 15:23:42 -04:00
sternenseemann
5f783493a9 soldat-unstable: run hooks for build and install phase 2021-04-25 14:11:16 +02:00
sternenseemann
c41d97c324 soldat-unstable: move unstable into version 
pname is still soldat, regardless of whether it is stable or unstable,
attribute name should keep the suffix for clarity (soldat stable is
unfree (?) and not packaged by us atm).
 2021-04-25 14:11:16 +02:00
sternenseemann
f24b888dc2 soldat-unstable: 2020-11-26 -> 2021-02-09 2021-04-25 14:11:16 +02:00
Sandro
2cb1dc3e5b
Merge pull request #120516 from bb2020/gimx 
gimx: cleanup
 2021-04-25 08:54:54 +02:00
Jonathan Ringer
69a4de6251
steamPackages.steam: use stable archive to avoid 404s 2021-04-24 09:48:44 -07:00
Jonathan Ringer
d79d927cca
steamPackages.steam: 1.0.0.69 -> 1.0.0.70 2021-04-24 09:37:38 -07:00
Sandro
6942038dbf
Merge pull request #119979 from Radvendii/mar1d-bump 
mar1d: 0.2.0 -> 0.3.0
 2021-04-24 08:56:10 +02:00
Stefan Frijters
c1c22e065d
openttd-jgrpp: 0.40.5 -> 0.41.0 2021-04-24 00:30:12 +02:00
Stefan Frijters
134fd7fbe4
openttd: 1.11.0 -> 1.11.1 2021-04-24 00:27:21 +02:00
bb2020
b81b6747ea gimx: cleanup 2021-04-23 23:08:54 +03:00
Luke Granger-Brown
e25eb0b7a5
Merge pull request #119756 from lukegb/factorio 
factorio/factorio-demo: 1.1.30 -> 1.1.32
 2021-04-23 20:44:14 +01:00
Ryan Mulligan
eb35277c1b
Merge pull request #120232 from IvarWithoutBones/bump/minecraft-launcher 
minecraft-launcher: 2.2.1441 -> 2.2.741
 2021-04-22 14:03:56 -07:00
Ivar Scholten
dabfce650a minecraft-launcher: 2.2.1441 -> 2.2.741 2021-04-22 18:08:17 +02:00
Taeer Bar-Yam
f0975780a7 mar1d: 0.2.0 -> 0.3.0 2021-04-21 22:46:05 -04:00
Michael Raskin
8ddbcd14ef
Merge pull request #119763 from marius851000/fgfs 
flightgear, simgear: 2020.4.{4,6} -> 2020.4.8
 2021-04-21 06:22:28 +00:00
Sandro
981471b0c9
Merge pull request #119890 from fgaz/warzone2100/4.0.1 
warzone2100: 4.0.0 -> 4.0.1
 2021-04-20 19:07:49 +02:00
marius david
dba7df8e4f flightgear: 2020.3.4 -> 2020.3.8 2021-04-20 14:55:56 +02:00
Francesco Gazzetta
93bda27068 warzone2100: 4.0.0 -> 4.0.1 2021-04-19 22:32:03 +02:00
Sandro
213fcedc17
Merge pull request #117287 from xfix/loop-hero-dependencies 2021-04-19 22:03:35 +02:00
Sandro
a74823577d
Merge pull request #119886 from OmnipotentEntity/katago-1.8.2 
katago: 1.8.1 -> 1.8.2
 2021-04-19 21:09:02 +02:00
Sandro
1e78caefb8
Merge pull request #119642 from jojosch/oh-my-git-init 2021-04-19 20:44:34 +02:00
Michael Reilly
72d78d8901 katago: 1.8.1 -> 1.8.2 2021-04-19 13:26:41 -04:00
Johannes Schleifenbaum
0ed5aa8f6a
oh-my-git: init at 0.6.4 2021-04-18 08:33:13 +02:00
Luke Granger-Brown
6a1a3eca9b factorio-demo: 1.1.30 -> 1.1.32 2021-04-17 21:48:09 +00:00
Luke Granger-Brown
9db7133769 factorio: 1.1.30 -> 1.1.32 2021-04-17 21:47:13 +00:00
Sandro
d6e1af5d9c
Merge pull request #119604 from selaux/ja2-stracciatella-0.17.0 
ja2-stracciatella 0.16.1 -> 0.17.0
 2021-04-17 19:36:10 +02:00
Stefan Lau
cf8ebdc9c6
ja2-stracciatella 0.16.1 -> 0.17.0 2021-04-17 09:46:51 +02:00
Sandro
f93a4f2add
Merge pull request #119456 from oxalica/bump/dotnet-sdk-5-0 2021-04-16 21:40:20 +02:00
Milan Pässler
93ad4bae79 mindustry: mark as broken 
The Mindustry source code makes heavy use of internal Java APIs that
were deprecated in Java 6 and removed in Java 16. It also makes use
of features that require Java >=14.
The author is not ready to provide compatibility with any
maintained Java version at this time.
 2021-04-16 18:54:04 +02:00
Technical27
3cee82ace3
lunar-client: 2.4.0 -> 2.6.0 (#119355) 
* lunar-client: add Technical27 to maintainers

* lunar-client: 2.4.0 -> 2.6.0
 2021-04-15 18:11:52 -04:00
Aaron Andersen
fb19505c01
Merge pull request #119395 from karolchmist/devilutionx-1.2.1 
devilutionx: 1.2.0 -> 1.2.1
 2021-04-15 16:21:23 -04:00
oxalica
939dc2da35
osu-lazer: 2021.331.0 -> 2021.410.0 2021-04-15 19:44:38 +08:00
Pavol Rusnak
5fd77b2c73
Merge pull request #119112 from squalus/darwin-scummvm 
scummvm: support darwin
 2021-04-14 22:48:47 +02:00
Sandro
80a0032cc9
Merge pull request #119352 from lorenzleutgeb/gradle-7 2021-04-14 18:58:38 +02:00
Sandro
81e6800870
Merge pull request #119416 from lukegb/factorio 
factorio-experimental: 1.1.30 -> 1.1.31
 2021-04-14 18:38:03 +02:00
Luke Granger-Brown
ca8374e022 factorio-experimental: 1.1.31 -> 1.1.32 2021-04-14 09:31:26 +00:00
Karol Chmist
627450ee61 devilutionx: 1.2.0 -> 1.2.1 2021-04-14 09:04:12 +02:00
Lorenz Leutgeb
b0ed229aad gradle: Pin pkgs to Gradle 6 that fail with 7 2021-04-14 00:06:02 +02:00
Anderson Torres
6f149cead2
Merge pull request #109146 from iblech/patch-sdlpop 
sdlpop: init at 1.21
 2021-04-13 08:15:27 -03:00
Luke Granger-Brown
c61868662e factorio-experimental: 1.1.30 -> 1.1.31 2021-04-13 09:31:24 +00:00
Ingo Blechschmidt
7d927c5448 sdlpop: init at 1.21 2021-04-13 02:45:42 +02:00
Sandro
d9de27d666
Merge pull request #115422 from reedrw/add-sbu 
shticker-book-unwritten: init at 1.0.3
 2021-04-12 17:10:19 +02:00
Sandro
e355946df1
Merge pull request #103546 from mnacamura/cdda-small-fix 2021-04-12 16:31:01 +02:00
squalus
3ac4604a52 scummvm: support darwin 2021-04-11 23:21:01 -07:00
Sandro
71fcdc0825
Merge pull request #119197 from reedrw/r2mod-107 
r2mod_cli: 1.0.6 -> 1.0.7
 2021-04-12 04:05:34 +02:00
Reed
320bbf0be4 r2mod_cli: 1.0.6 -> 1.0.7 2021-04-11 20:24:04 -04:00
Sandro
d115d74cae
Merge pull request #119184 from reedrw/r2mod-fix 
r2mod_cli: use bashInteractive as interpreter
 2021-04-11 22:59:53 +02:00
Reed
2a3ff38680 r2mod_cli: use bashInteractive as interpreter 2021-04-11 15:17:05 -04:00
Atemu
45ad2b290f anki-bin: 2.1.40 -> 2.1.43 2021-04-11 13:50:11 +02:00
nixinator
3314db5a56
cdogs-sdl: init at 0.11.0 (#118949) 
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-04-10 17:23:57 +02:00
Ryan Mulligan
c3df7b27bb
Merge pull request #118528 from r-ryantm/auto-update/osu-lazer 
osu-lazer: 2021.323.0 -> 2021.331.0
 2021-04-09 20:50:37 -07:00
Stefan Frijters
5f3ba2015b
openttd: Remove libxdg_basedir as dependency 
Dependency in code removed at 3dfee979a7e486b8d90f6398ea557d2889855059.

"Codechange: Drop libxdg-basedir dependency in favour of finding the directories ourselves"
 2021-04-09 23:52:27 +02:00
Aaron Andersen
dff8fd1d67 devilutionx: update sha256, fix build 2021-04-08 18:18:46 -04:00
Karol Chmist
81829ece77 devilutionx: unstable-2020-10-20 -> 1.2.0 2021-04-08 11:02:11 +02:00
Sandro
0fcc3a1925
Merge pull request #118636 from IvarWithoutBones/init/antsim 
antsimulator: init at 1.2
 2021-04-08 02:26:52 +02:00
Christian Kampka
2ea305eeb0
wesnoth: 1.14.15 -> 1.14.16 2021-04-07 20:44:20 +02:00
Sandro
0582cc9cc6
Merge pull request #118368 from xdHampus/uhexen2 
uhexen2: init at 1.5.9
 2021-04-07 09:54:49 +02:00
IvarWithoutBones
48a2307da5 antsimulator: init at 1.2 2021-04-06 22:48:11 +02:00
Sandro
d7ae55d28d
Merge pull request #118600 from fgaz/warzone2100/4.0.0 
warzone2100: 3.4.1 -> 4.0.0
 2021-04-06 10:30:17 +02:00
R. RyanTM
2e1520d479 unciv: 3.13.11-patch2 -> 3.13.12-patch1 2021-04-05 23:47:58 -04:00
Sandro
da456eca33
Merge pull request #118513 from SuperSandro2000/devx 
devilutionx: remove not required enableParallelBuilding, move unstabl…
 2021-04-06 03:11:57 +02:00
Facteur Pat
d8e7ab02f3
cockatrice: 2.8.0 -> 2.8.1-beta (#116100) 2021-04-06 02:08:23 +02:00
Sandro
448e3c4d85
Merge pull request #97657 from IvarWithoutBones/sm64ex-update 
sm64ex: unstable-2020-06-19 -> unstable-2020-10-09
 2021-04-05 21:40:30 +02:00
Francesco Gazzetta
65bfbb80d3 warzone2100: 3.4.1 -> 4.0.0 2021-04-05 16:08:32 +02:00
xdHampus
32b1dddd18 uhexen2: init at 1.5.9 2021-04-05 13:55:09 +00:00
Sandro
7c932296e0
Merge pull request #116335 from SuperSandro2000/move-aliases.nix 2021-04-05 04:07:15 +02:00
R. RyanTM
ae0c468e96 osu-lazer: 2021.323.0 -> 2021.331.0 2021-04-05 01:25:59 +00:00
Reed
897cbe0928 shticker-book-unwritten: init at 1.0.3 2021-04-04 20:26:33 -04:00
Sandro Jäckel
1f79e3530b devilutionx: remove not required enableParallelBuilding, move unstable to version number 2021-04-05 00:45:02 +02:00
Karol Chmist
8479a427cd devolutionx: 1.0.1 -> unstable-2020-10-20 
Set devilutionx to commit 432fbc8e that fixes build with dynamic SDL2. Disable failing devilutionx build on darwin.
 2021-04-04 22:42:41 +02:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
IvarWithoutBones
81d749f53b sm64ex: unstable-2020-06-19 -> unstable-2020-10-09 2021-04-04 17:39:40 +02:00
Frederik Rietdijk
c85a64002c gnubg: use python3 2021-04-03 17:06:07 +02:00
Frederik Rietdijk
76b3f90f5c gemrb: stay with python2 2021-04-03 17:06:07 +02:00
Sandro
491dbaf25a
Merge pull request #118257 from SFrijters/openttd-1.11.0 2021-04-02 18:16:38 +02:00
Stefan Frijters
cf56e0ebcc
openttd-jgrpp: 0.34.4 -> 0.40.5 2021-04-01 19:55:38 +02:00
Daniel Nagy
782643cb09
superTuxKart: add changelog 2021-04-01 17:59:47 +02:00