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
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
