Commit Graph

4775 Commits

Author SHA1 Message Date
Maximilian Bosch
32b9c9a189
EmptyEpsilon: 2021.03.31 -> 2021.06.23 (#129739)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-09 14:42:43 +02:00
Michael Reilly
17d2bc7eeb katago: Corrected git commit hash to be the tagged version, not the old tagged version 2021-07-07 12:09:42 -04:00
Sandro
69f2ee1add
Merge pull request #129453 from McSinyx/flare-1.12rc1
flare: 1.11 -> 1.12rc1
2021-07-07 02:31:51 +02:00
Robin Townsend
57d0e94d86 minecraft-server: 1.17 -> 1.17.1 2021-07-06 16:30:59 -04:00
Nguyễn Gia Phong
873fd459a3
flare: 1.11 -> 1.12rc1 2021-07-06 22:50:34 +07:00
oxalica
1d7fab3457
osu-lazer: 2021.612.0 -> 2021.703.0 2021-07-06 17:17:54 +08:00
Ben Siraphob
375d84f790
Merge pull request #129401 from siraben/powder-mainProgram
the-powder-toy: add mainProgram, update license
2021-07-06 12:53:31 +07:00
Ben Siraphob
8f312f630b the-powder-toy: update license 2021-07-06 12:43:22 +07:00
Ben Siraphob
6154b83a93 the-powder-toy: add mainProgram 2021-07-06 11:36:48 +07:00
Vladimír Čunát
ac0c470abd
Merge branch 'staging-next' 2021-07-05 21:21:20 +02:00
Sandro
2903a2639f
Merge pull request #129150 from DeeUnderscore/cataclysm-dda-0.F 2021-07-05 20:27:01 +02:00
github-actions[bot]
e16d818a0b
Merge master into staging-next 2021-07-05 18:01:11 +00:00
Sandro
01e2d5fb4e
Merge pull request #129335 from fgaz/warzone2100/4.1.0 2021-07-05 18:41:49 +02:00
Francesco Gazzetta
299f265ce5 warzone2100: 4.0.1 -> 4.1.0 2021-07-05 17:53:36 +02:00
R. RyanTM
77014317d6 fheroes2: 0.9.4 -> 0.9.5 2021-07-05 08:22:36 +00:00
github-actions[bot]
1d77a209c4
Merge master into staging-next 2021-07-05 06:01:05 +00:00
Ben Siraphob
860f9f218b
Merge pull request #129207 from siraben/stockfish-update
stockfish: 13 -> 14
2021-07-05 10:42:14 +07:00
D Anzorge
27b3e0ab56 cataclysm-dda-git: 2020-12-09 -> 2021-07-03 2021-07-04 18:50:58 +02:00
D Anzorge
5f298b119a cataclysm-dda: 0.E-3 -> 0.F 2021-07-04 18:50:58 +02:00
Ben Siraphob
8a275690bc stockfish: add siraben to maintainers 2021-07-04 11:25:37 +07:00
Ben Siraphob
4feb20b7b1 stockfish: 13 -> 14 2021-07-04 11:25:25 +07:00
github-actions[bot]
af65e88cc6
Merge master into staging-next 2021-07-04 00:01:25 +00:00
Maximilian Bosch
7ac1a2eca7
Merge pull request #129164 from r-ryantm/auto-update/katago
katago: 1.9.0 -> 1.9.1
2021-07-04 00:59:41 +02:00
Pavol Rusnak
9a2966f7b9
Merge pull request #85698 from ToxicFrog/openttd
add openttd `nml` and `grfcodec` tools
2021-07-04 00:24:42 +02:00
Rebecca Kelly
82c4085089 openttd-nml: init at 0.5.3 2021-07-03 17:54:01 -04:00
Rebecca Kelly
277d1a1569 openttd-grfcodec: init at 6.0.6+git20210310
N.b. 6.0.6 release version is ~5 years old now, and doesn't build under gcc10
2021-07-03 17:54:01 -04:00
Dmitry Kalinkin
f0fbfdefe7
Merge branch 'master' into staging-next 2021-07-03 17:51:15 -04:00
Luke Granger-Brown
e77ce56f9e
Merge pull request #129143 from fgaz/warzone2100/dataroot
warzone2100: better fix for absolute bindir
2021-07-03 19:47:47 +01:00
R. RyanTM
c22c07f530 katago: 1.9.0 -> 1.9.1 2021-07-03 18:05:39 +00:00
Francesco Gazzetta
b5b5dbb62d warzone2100: better fix for absolute bindir 2021-07-03 16:56:42 +02:00
github-actions[bot]
dcd8f68f13
Merge master into staging-next 2021-07-02 00:01:33 +00:00
R. RyanTM
efed1ede1f freeciv: 2.6.4 -> 2.6.5 2021-07-01 13:32:11 -07:00
github-actions[bot]
26416f52eb
Merge master into staging-next 2021-07-01 12:01:05 +00:00
ajs124
25af30b19a
Merge pull request #128269 from r-ryantm/auto-update/extremetuxracer
extremetuxracer: 0.8.0 -> 0.8.1
2021-07-01 13:23:49 +02:00
github-actions[bot]
7350c52b9b
Merge master into staging-next 2021-07-01 00:01:35 +00:00
Yuka
bf93f1c180
xonotic: fix urls (#128766) 2021-06-30 23:15:54 +02:00
github-actions[bot]
629cea2cd0
Merge master into staging-next 2021-06-30 12:04:22 +00:00
Artturin
cd3ed54f6e dwarf-fortress: refactor 2021-06-30 00:10:57 -07:00
github-actions[bot]
7f05df0a91
Merge master into staging-next 2021-06-30 06:04:18 +00:00
Sandro
431ca39942
Merge pull request #128628 from Stunkymonkey/xonotic
xonotic: fix url
2021-06-30 02:38:47 +02:00
github-actions[bot]
0fa08dae1b
Merge master into staging-next 2021-06-30 00:08:50 +00:00
Mark Vainomaa
994671a259
quakespasm: 0.93.1 -> 0.93.2 (#128654) 2021-06-30 01:01:13 +02:00
Felix Buehler
55562f8122 xonotic: fix url 2021-06-29 15:15:22 +02:00
github-actions[bot]
de136681f7
Merge master into staging-next 2021-06-29 06:04:18 +00:00
Ben Siraphob
0966d546ec
Merge pull request #128276 from peterhoeg/f/gemrb
gemrb: vlc is only needed on mac
2021-06-29 11:53:24 +07:00
Ben Siraphob
7989f7ee74
Merge pull request #128575 from r-ryantm/auto-update/katago
katago: 1.8.2 -> 1.9.0
2021-06-29 10:53:09 +07:00
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