Commit Graph

4918 Commits

Author SHA1 Message Date
davidak
677dc1b93b
Merge pull request #122134 from fricklerhandwerk/freeciv-gtk
freeciv: build with `gtk` with `gtkClient = true`
2021-08-03 08:10:12 +02:00
Kevin Cox
d4d9dd61a1 dwarf-fortress-packages.twbt: Fix twbt version to match tfhack version.
Otherwise you get an error upon starting the game:

```
Plugin twbt was not built for this version of DFHack.
Plugin: 0.47.05-beta1, DFHack: 0.47.05-r1
```
2021-07-31 22:05:44 -04:00
Ben Siraphob
2f94991628 treewide: fix redirected URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2021-08-01 00:01:50 +07:00
R. RyanTM
7d0285d139 crawl: 0.26.1 -> 0.27.0 2021-07-31 10:29:45 +00:00
Artturi
6463828755
openmw: add wrapQtAppsHook (#132131)
dontWrapQtApps was blanket added in
5590e365e4
2021-07-30 20:40:22 -04:00
Sander van der Burg
00486ec99e
Merge pull request #131864 from svanderburg/add-rott
rott: init at 1.1.2
2021-07-30 18:09:43 +02:00
Tristan Gosselin-Hane
e8d67ac8fc multimc: don't re-distribute package
Fixes NixOS#131983
2021-07-30 06:47:51 +00:00
Tristan Gosselin-Hane
1a980484d6 multimc: change license to asl20 2021-07-30 06:47:51 +00:00
Sander van der Burg
946ad968ff rott: init at 1.1.2 2021-07-29 20:27:02 +02:00
Frederik Rietdijk
8dcfe523f7
Merge pull request #131719 from FRidh/python2-to-3
Python: further migrate packages from 2 to 3
2021-07-29 10:49:00 +02:00
github-actions[bot]
6fcda9f1ec
Merge master into staging-next 2021-07-28 18:01:16 +00:00
Franz Pletz
f0f7042717
Merge pull request #131619 from oxzi/openrct2-0.3.4.1
openrct2: 0.3.4 -> 0.3.4.1
2021-07-28 19:45:58 +02:00
github-actions[bot]
a1d3be1d42
Merge master into staging-next 2021-07-28 12:01:16 +00:00
github-actions[bot]
ef4ddefb6e
Merge master into staging-next 2021-07-28 00:01:24 +00:00
Sander van der Burg
f65e1d8793 ecwolf: fix compilation on darwin 2021-07-27 23:11:09 +02:00
Sander van der Burg
9de184f9bc
Merge pull request #131593 from svanderburg/add-ecwolf
ecwolf: init at 1.3.3
2021-07-27 21:54:17 +02:00
Frederik Rietdijk
edd356d0a6 ja2-stracciatella: change to python3 2021-07-27 20:37:04 +02:00
github-actions[bot]
737604e550
Merge master into staging-next 2021-07-27 00:01:35 +00:00
Sander van der Burg
de9913708c ecwolf: init at 1.3.3 2021-07-26 23:31:31 +02:00
Alvar Penning
8b8819460c openrct2: 0.3.4 -> 0.3.4.1 2021-07-26 23:25:55 +02:00
Ben Siraphob
e92eccaa2a
Merge pull request #131599 from siraben/cbonsai-cross
cbonsai: fix cross-compilation
2021-07-27 02:09:39 +07:00
Ben Siraphob
ee20f1abe9 cbonsai: fix cross-compilation 2021-07-27 01:13:00 +07:00
Frederik Rietdijk
62370fb59a Merge remote-tracking branch 'upstream/master' into staging-next 2021-07-26 09:19:44 +02:00
Sandro
e82ffe7b5f
Merge pull request #131518 from fgaz/warzone2100/4.1.1
warzone2100: 4.1.0 -> 4.1.1
2021-07-25 23:13:46 +00:00
Francesco Gazzetta
6be2cb762e warzone2100: 4.1.0 -> 4.1.1 2021-07-25 22:40:25 +02:00
Sander van der Burg
94ac68c879 eduke32: 20200907 -> 20210722 2021-07-25 22:04:24 +02:00
Sandro
f649ee29f3
Merge pull request #131315 from McSinyx/blackshades-1.3.1
blackshades: 1.1.1 -> 1.3.1
2021-07-25 07:31:33 +00:00
Nguyễn Gia Phong
6d76262230
blackshades: 1.1.1 -> 1.3.1 2021-07-25 14:12:41 +07:00
github-actions[bot]
a37fbac53b
Merge master into staging-next 2021-07-25 00:01:35 +00:00
Sandro
0f73e0d6a9
Merge pull request #131399 from Stunkymonkey/tcl2048-phases
tcl2048: deprecate phases
2021-07-24 23:00:30 +00:00
Felix Buehler
4183793b49 tcl2048: deprecate phases 2021-07-25 00:39:40 +02:00
Felix Buehler
df9d5f8fe5 minecraft-server: deprecate phases 2021-07-25 00:14:56 +02:00
github-actions[bot]
cb1426e30a
Merge staging-next into staging 2021-07-23 18:01:46 +00:00
Sandro
9c5cc97cf3
Merge pull request #122625 from fgaz/gnonograms/init
gnonograms: init at 1.4.5
2021-07-23 15:26:25 +02:00
github-actions[bot]
3bc17773a5
Merge staging-next into staging 2021-07-23 12:02:01 +00:00
Savanni D'Gerinel
1443590c5b
cgoban: init at 3.5.23 (#130285)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-23 11:36:28 +02:00
github-actions[bot]
efbc139f5d
Merge staging-next into staging 2021-07-23 06:01:46 +00:00
Luke Granger-Brown
c0340896a5 factorio-demo: 1.1.35 -> 1.1.36 2021-07-22 20:15:17 -07:00
Luke Granger-Brown
2070721739 factorio: 1.1.35 -> 1.1.36 2021-07-22 20:15:17 -07:00
github-actions[bot]
0b0a8c7c9a
Merge staging-next into staging 2021-07-22 18:01:39 +00:00
Sandro
05a32fe4b7
Merge pull request #130587 from hrhino/fix/simutrans
simutrans: 120.4.1 -> 121.0.0
2021-07-22 17:04:23 +02:00
Sandro
3b12024914
Merge pull request #130497 from Stunkymonkey/zandronum-phases 2021-07-22 16:02:53 +02:00
github-actions[bot]
a63cf4f913
Merge staging-next into staging 2021-07-22 12:01:52 +00:00
Sandro
6c83b32512
Merge pull request #131004 from r-ryantm/auto-update/cdogs
cdogs-sdl: 0.12.0 -> 0.13.0
2021-07-22 10:54:32 +02:00
github-actions[bot]
2e00ed4420
Merge staging-next into staging 2021-07-22 06:01:44 +00:00
R. RyanTM
0044c62188 cdogs-sdl: 0.12.0 -> 0.13.0 2021-07-22 00:49:14 +00:00
Artturin
d2b557bcdd grapejuice: 3.12.5 -> 3.40.14 2021-07-21 19:37:43 +03:00
Maximilian Bosch
0c7cc39e6c
Merge pull request #130881 from r-ryantm/auto-update/gnuchess
gnuchess: 6.2.8 -> 6.2.9
2021-07-21 13:46:18 +02:00
github-actions[bot]
94a7cf0dcd
Merge staging-next into staging 2021-07-21 00:02:24 +00:00
R. RyanTM
8ccb61d526 gnuchess: 6.2.8 -> 6.2.9 2021-07-20 23:25:09 +00:00
Sandro
07a363dba1
Merge pull request #130840 from oxalica/osu-lazer
osu-lazer: 2021.707.0 -> 2021.720.0 and fix build failure
2021-07-21 00:11:12 +02:00
Alex Griffin
013fe00139 anki-bin: install desktop entry and man page 2021-07-20 13:53:09 -05:00
oxalica
31990d01dc
osu-lazer: 2021.707.0 -> 2021.720.0
The tag `2021.707.0` is deleted from upstream, result in a build failure
2021-07-21 02:15:48 +08:00
Harrison Houghton
504c9335f6 simutrans: 120.4.1 -> 121.0.0
The former version was having compilation issues; the latter does not.
2021-07-20 09:28:20 -04:00
github-actions[bot]
0e13cd9f49
Merge staging-next into staging 2021-07-20 12:02:50 +00:00
Michael Raskin
a1f18b0c43
Merge pull request #130644 from lopsided98/ompl-update
ode: 0.12 -> 0.16.2
2021-07-20 10:38:23 +00:00
Ben Siraphob
e8599765f5
Merge pull request #130638 from siraben/par-treewide
treewide: remove unnecessary enableParallelBuilding when using cmake, meson, qmake
2021-07-20 12:10:21 +07:00
Ben Siraphob
d3c911fef2 the-powder-toy: remove unnecessary enableParallelBuilding 2021-07-20 10:32:58 +07:00
Ben Siraphob
4ce8c34049 treewide: remove unnecessary enableParallelBuilding when using qmake 2021-07-20 10:32:58 +07:00
Alvar Penning
0066d898c9 openrct2: 0.3.3 -> 0.3.4
Next to the version bump, some options were reordered to satisfy
nixpkgs-hammering.
2021-07-19 16:09:04 -07:00
Ben Wolsieffer
a6470c3ca2 xmoto: 0.5.11 -> 0.6.1 2021-07-19 18:15:14 -04:00
Ben Siraphob
950ecb9cc6 the-powder-toy: 96.0.348 -> 96.1.349 2021-07-19 17:23:42 +07:00
Felix Buehler
82cb33a0ae treewide: remove meta.version 2021-07-18 00:07:38 +02:00
Felix Buehler
eb7b28cae8 zandronum-sqlite: remove phases 2021-07-17 23:16:49 +02:00
Luke Granger-Brown
1669ae6a68 factorio-demo: 1.1.35 -> 1.1.36 2021-07-17 09:32:43 +00:00
Luke Granger-Brown
0c2e21bc2b factorio: 1.1.35 -> 1.1.36 2021-07-17 09:31:42 +00:00
TredwellGit
79a4590495 steamPackages.steam-fhsenv: fix Proton
LLVM must match version required by Mesa.

Fixes https://github.com/NixOS/nixpkgs/issues/127068
2021-07-16 15:13:31 -07:00
Francesco Gazzetta
76db02360a gnonograms: init at 1.4.5 2021-07-16 11:03:02 +02:00
boppyt
c9cfa6599c
osu-lazer: 2021.703.0 -> 2021.707.0 (#130283)
* osu-lazer: 2021.703.0 -> 2021.707.0-lazer

* Update pkgs/games/osu-lazer/default.nix

Co-authored-by: oxalica <oxalicc@pm.me>

Co-authored-by: oxalica <oxalicc@pm.me>
2021-07-15 23:42:00 +02:00
Sandro
3018b27b01
Merge pull request #130251 from McSinyx/flare-1.12rc2
flare: 1.12rc1 -> 1.12rc2
2021-07-15 20:44:38 +02:00
Philipp
520ce89b29
mudlet: 4.9.1 -> 4.12.0 (#126121)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-15 18:17:51 +02:00
Ben Siraphob
0e06fbbfa0 the-powder-toy: 95.0 -> 96.0.348 2021-07-15 17:59:59 +07:00
Nguyễn Gia Phong
b9cb6066f7
flare: 1.12rc1 -> 1.12rc2 2021-07-15 15:11:37 +07:00
Bernardo Meurer
6dd4113c3c
Merge pull request #130195 from baracoder/steam-runtime-20210630
steamPackages.steam-runtime: 20210527.0 -> 20210630.0
2021-07-14 12:10:23 -07:00
Herman Fries
7cae055159 steamPackages.steam-runtime: 20210527.0 -> 20210630.0 2021-07-14 16:55:53 +02:00
Sandro
2d2d6ccd37
Merge pull request #130120 from lukegb/factorio
factorio-experimental: 1.1.35 -> 1.1.36
2021-07-13 23:20:22 +02:00
Dmitry Kalinkin
c149772546
Merge pull request #130044 from Mindavi/bugfix/makewrapper-fixes
Move makeWrapper to nativeBuildInputs for some packages
2021-07-13 14:23:25 -04:00
Luke Granger-Brown
322654b880 factorio-experimental: 1.1.35 -> 1.1.36 2021-07-13 18:02:44 +00:00
Rick van Schijndel
ab559bd823 iortcw: move makeWrapper to nativeBuildInputs 2021-07-12 21:56:44 +02:00
Rick van Schijndel
facdb727a0 flare: move makeWrapper to nativeBuildInputs 2021-07-12 21:55:53 +02:00
Rick van Schijndel
08ca856305 0ad: move makeWrapper to nativeBuildInputs 2021-07-12 21:30:41 +02:00
Rick van Schijndel
9e1ff110b5 uchess: move makeWrapper to nativeBuildInputs 2021-07-12 21:22:27 +02:00
Jonathan Ringer
93524fa876 dwarf-fortress/themes: update 2021-07-11 21:03:43 -07:00
Jonathan Ringer
a4ebde8064 dwarf-fortress/twbt: add 0.47.05 support 2021-07-11 21:03:43 -07:00
Jonathan Ringer
a280713665 dwarf-fortress/dfhack: add 0.47.05-r1 2021-07-11 21:03:43 -07:00
Jonathan Ringer
ea10f44327 dwarf-fortress/unfuck: add 0.47.05 2021-07-11 21:03:43 -07:00
Jonathan Ringer
4cc7482b21 dwarf-fortress: 0.47.04 -> 0.47.05 2021-07-11 21:03:43 -07:00
Sage Raflik
b18a3d0583 papermc: 1.16.5r771 -> 1.17.1r97 2021-07-10 13:19:52 -05:00
Sandro
33d15b9f58
Merge pull request #129770 from fgaz/tlk-games/init 2021-07-10 01:00:32 +02:00
Sandro
ccae99671d
Merge pull request #129769 from p3s/unciv
unciv : 3.13.12-patch -> 3.15.9
2021-07-10 00:54:03 +02:00
Francesco Gazzetta
0851d84fed powermanga: init at 0.93.1 2021-07-09 18:47:40 +02:00
Francesco Gazzetta
ff1b1874f8 tecnoballz: init at 0.93.1 2021-07-09 18:45:21 +02:00
Payas Relekar
4b0dcec686 unciv : 3.13.12-patch -> 3.15.9 2021-07-09 21:50:39 +05:30
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