Commit graph

4926 commits

Author SHA1 Message Date
Jan Tojnar 7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Sandro ef9b54f47e
Merge pull request #135011 from zeri42/springfix 2021-08-21 15:02:38 +02:00
R. RyanTM 2caeaca5ff crawl: 0.27.0 -> 0.27.1 2021-08-21 12:48:52 +00:00
Luke Granger-Brown 611aede968
Merge pull request #135021 from lukegb/factorio
factorio: 1.1.37 -> 1.1.38
2021-08-21 02:36:43 +01:00
Sandro 3fa9700cd0
Merge pull request #134363 from fgaz/warzone2100/4.1.3
warzone2100: 4.1.1 -> 4.1.3
2021-08-21 02:20:24 +02:00
Luke Granger-Brown b0c792ec41 factorio-demo: 1.1.37 -> 1.1.38 2021-08-20 23:45:58 +00:00
Luke Granger-Brown 682021ce3f factorio-experimental: 1.1.37 -> 1.1.38 2021-08-20 23:45:06 +00:00
Luke Granger-Brown 745542a016 factorio: 1.1.37 -> 1.1.38 2021-08-20 23:44:21 +00:00
zeri42 ec17a78912 spring: 104.0.1 -> 105.0.1 2021-08-21 00:26:06 +02:00
R. RyanTM 66ba8bc39f crispyDoom: 5.10.2 -> 5.10.3 2021-08-20 20:57:53 +00:00
Michael Raskin be86a2b10d
Merge pull request #134975 from r-ryantm/auto-update/atanks
atanks: 6.5 -> 6.6
2021-08-20 18:23:15 +00:00
R. RyanTM a1de036c33 atanks: 6.5 -> 6.6 2021-08-20 17:32:06 +00:00
Sandro 47790d05f4
Merge pull request #134951 from marius851000/fixpioneer
pioneer: fix model compilation
2021-08-20 16:22:18 +02:00
marius david 77eb4bc533 pioneer: fix execution 2021-08-20 15:03:00 +02:00
Sandro 6cbfbcda92
Merge pull request #134537 from fgaz/shattered-pixel-dungeon/1.0.0
shattered-pixel-dungeon: 0.9.3 -> 1.0.0
2021-08-19 21:37:45 +02:00
Sandro ed2fdff713
Merge pull request #134742 from DeeUnderscore/cataclysm-dda-0.F-1 2021-08-19 20:08:15 +02:00
github-actions[bot] 2970c28349
Merge staging-next into staging 2021-08-19 06:01:34 +00:00
davidak 698d7e277b
Merge pull request #134490 from r-ryantm/auto-update/vkquake
vkquake: 1.05.2 -> 1.05.3
2021-08-19 02:28:56 +02:00
D Anzorge 98af443596 cataclysm-dda: 0.F -> 0.F-1 2021-08-19 01:06:38 +02:00
github-actions[bot] cadf0193dd
Merge staging-next into staging 2021-08-18 18:01:40 +00:00
Ryan Mulligan d66e050644
Merge pull request #134422 from r-ryantm/auto-update/osu-lazer
osu-lazer: 2021.720.0 -> 2021.815.0
2021-08-18 09:53:29 -07:00
github-actions[bot] b6a825a9c7
Merge staging-next into staging 2021-08-18 06:02:10 +00:00
Ben Siraphob e81da64d2c
Merge pull request #134397 from r-ryantm/auto-update/freeorion
freeorion: 0.4.10.1 -> 0.4.10.2
2021-08-17 19:17:03 -05:00
github-actions[bot] 2341511023
Merge staging-next into staging 2021-08-18 00:01:59 +00:00
Ben Siraphob f0a97d26f9
Merge pull request #134520 from r-ryantm/auto-update/ultimate-stunts
ultimatestunts: 0.7.6.1 -> 0.7.7.1
2021-08-17 17:47:35 -05:00
Francesco Gazzetta ea300d1e2d shattered-pixel-dungeon: 0.9.3 -> 1.0.0 2021-08-17 22:40:48 +02:00
R. RyanTM 17a8902c2f ultimatestunts: 0.7.6.1 -> 0.7.7.1 2021-08-17 19:28:13 +00:00
Artturi d100199818
Merge pull request #134061 from r-ryantm/auto-update/VASSAL
vassal: 3.5.3 -> 3.5.8
2021-08-17 22:02:38 +03:00
R. RyanTM 90f7da71f8 vkquake: 1.05.2 -> 1.05.3 2021-08-17 17:00:37 +00:00
Jan Tojnar e286e1cfa0 Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f) × boost attributes are inherited on staging (d20aa4955d)

- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507) × hardened kernels are versioned on staging (a5341beb78) + removed linux_5_12 (e55554491d)

- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
R. RyanTM acc9fd5415 pioneer: 20210203 -> 20210723 2021-08-17 14:03:04 +00:00
R. RyanTM 3e81d05bbb osu-lazer: 2021.720.0 -> 2021.815.0 2021-08-17 10:50:34 +00:00
R. RyanTM 682c2f2006 freeorion: 0.4.10.1 -> 0.4.10.2 2021-08-17 05:02:22 +00:00
Francesco Gazzetta 4b5f0bfa39 warzone2100: 4.1.1 -> 4.1.3 2021-08-16 23:03:25 +02:00
Luke Granger-Brown c6dc09c9e9
Merge pull request #133877 from nbraud/factorio/1.1.37
factorio: 1.1.36 → 1.1.37
2021-08-16 19:22:50 +01:00
Sandro 6327a87b56
Merge pull request #133792 from j0hax/ballerburg
ballerburg: include desktop file and icon
2021-08-16 15:16:22 +02:00
github-actions[bot] 9b3f32c547
Merge staging-next into staging 2021-08-16 06:01:39 +00:00
davidak 6978917102 oh-my-git: clearify dependency
the actual dependency is libudev
2021-08-16 12:36:28 +09:00
r-burns 58abd73367
oh-my-git: fix strict eval (#134281)
libudev is an alias to udev
2021-08-15 23:18:23 -04:00
davidak 71ab3c29f9
Merge pull request #134275 from Kranzes/omg-udev
oh-my-git: Add libudev
2021-08-16 02:27:37 +02:00
Ilan Joselevich a13f8aa9be oh-my-git: Add libudev 2021-08-16 02:37:18 +03:00
github-actions[bot] 4dfde9ac8e
Merge staging-next into staging 2021-08-15 18:01:33 +00:00
Robert Hensing fbafeb7ad5 treewide: runCommandNoCC -> runCommand
This has been synonymous for ~5y.
2021-08-15 17:36:41 +02:00
Johannes Arnold b40971db7f ballerburg: include desktop file and icon 2021-08-15 15:25:17 +02:00
Jörg Thalheim 52657498f7
Merge pull request #133588 from zhaofengli/nuget-to-nix
nuget-to-nix: init
2021-08-15 07:02:43 +01:00
R. RyanTM 5c91293cdf vassal: 3.5.3 -> 3.5.8 2021-08-14 17:10:41 +00:00
Jan Tojnar cdb1d29692 Merge branch 'staging-next' into staging 2021-08-14 14:43:16 +02:00
Zhaofeng Li 4d327d1e3f osu-lazer: Use nuget-to-nix in updater script 2021-08-13 22:50:20 -07:00
nicoo d7ae8cf1fe factorio: 1.1.36 → 1.1.37 2021-08-14 07:02:43 +02:00
Michael Raskin f9380d3783
Merge pull request #133619 from angustrau/liberation-circuit
liberation-circuit: init at 1.3
2021-08-13 10:53:06 +00:00
Angus Trau 005f28eca8 liberation-circuit: init at 1.3 2021-08-13 19:24:36 +10:00
Felix Buehler 75959982e5 games: replace name with pname&version 2021-08-12 22:28:38 +02:00
github-actions[bot] 7ae0b00541
Merge staging-next into staging 2021-08-11 18:01:46 +00:00
Jan Tojnar 807d3ec359 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/misc/t1utils/default.nix
2021-08-11 16:34:11 +02:00
Sandro fa556a76c4
Merge pull request #131976 from McSinyx/brutalmaze 2021-08-11 16:33:52 +02:00
Sandro 45b6595e86
Merge pull request #133434 from nagy/ioquake3 2021-08-11 10:49:53 +02:00
Artturi a4c256fa86
Merge pull request #133362 from r-ryantm/auto-update/antsimulator 2021-08-11 04:40:00 +03:00
Artturin 58156d95e9 antsimulator: fix texture path 2021-08-11 04:31:46 +03:00
Artturi 76ab20e3b7
Merge pull request #133419 from r-ryantm/auto-update/crispy-doom
crispyDoom: 5.10.1 -> 5.10.2
2021-08-11 04:03:27 +03:00
Daniel Nagy 20f7b7517e
ioquake3: 2020-12-26 -> 2021-07-20 2021-08-11 00:30:53 +02:00
R. RyanTM 41d065ef60 crispyDoom: 5.10.1 -> 5.10.2 2021-08-10 20:01:17 +00:00
Sandro da5f8ba58c
Merge pull request #133348 from marius851000/portmod-update
portmod: 2.0_beta9 -> 2.0.3
2021-08-10 15:27:59 +02:00
R. RyanTM 07ebaed974 antsimulator: 1.2 -> 3.1 2021-08-10 11:05:35 +00:00
marius david bce379dd87 portmod: 2.0_beta9 -> 2.0.3 2021-08-10 11:58:18 +02:00
Sandro Jäckel b2bdf29ced
ecwolf: cleanup, format 2021-08-10 10:19:29 +02:00
Charlotte Van Petegem dfe3b739c7
zeroad: make sure hydra builds zeroad-unwrapped
Hydra hasn't built zeroad since the 0.0.24 bump:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.zeroad.x86_64-linux/all
This is due to the data package becoming larger than the output
limit. Even though the data package is already marked with
`hydraPlatforms = [];`, hydra still tried to build it, since it is a
dependency of `zeroad`. This makes it so `zeroad` isn't built by hydra
either. Only `zeroad-unwrapped` (which takes significant compilation
time) will be built by hydra.
2021-08-10 09:37:34 +02:00
Nguyễn Gia Phong 8096436f28
brutalmaze: init at 1.1.1 2021-08-10 11:42:13 +07:00
Manuel F. Schmid a777419869 zeroad: 0.0.24b -> 0.0.25 2021-08-09 13:41:01 +02:00
Artturi a0e7ff1153
Merge pull request #129475 from robintown/minecraft-server
minecraft-server: 1.17 -> 1.17.1
2021-08-08 08:28:28 +03:00
Sandro fe06160c09
Merge pull request #133044 from robgssp/anki-bin-update
anki-bin: 2.1.44 -> 2.1.46
2021-08-08 05:12:46 +02:00
Robert Glossop 08c8e87b99 anki-bin: 2.1.44 -> 2.1.46 2021-08-07 20:30:38 -05:00
Sandro Jäckel 16ffbe7582
marathon: format 2021-08-08 02:38:43 +02:00
Artturi 658c431079
Merge pull request #117598 from r-ryantm/auto-update/manaplus
manaplus: 1.9.3.23 -> 2.1.3.17
2021-08-08 03:35:11 +03:00
R. RyanTM 45f3eea922
angband: 4.2.2 -> 4.2.3 (#132372)
Co-authored-by: Artturi <Artturin@artturin.com>
2021-08-08 03:05:24 +03:00
Artturi a8e797b9f8
Merge pull request #124092 from r-ryantm/auto-update/marathon
alephone-marathon: 20200904 -> 20210408
2021-08-08 02:55:03 +03:00
Artturi 456c65021f
Merge pull request #132982 from r-ryantm/auto-update/fheroes2
fheroes2: 0.9.5 -> 0.9.6
2021-08-08 02:22:19 +03:00
Sander van der Burg 8fa19a7a6c
Merge pull request #132826 from svanderburg/add-desktopitems
Add desktopitems for some classic games
2021-08-07 20:32:00 +02:00
Artturi a613f88023
Merge pull request #116403 from r-ryantm/auto-update/dhewm3
dhewm3: 1.5.0 -> 1.5.1
2021-08-07 21:08:13 +03:00
Sandro ceb245203b
Merge pull request #133027 from legendofmiracles/rpg-cli/update
rpg-cli: 0.5.0 -> 0.6.0
2021-08-07 19:36:28 +02:00
legendofmiracles 4e370c5020
rpg-cli: 0.5.0 -> 0.6.0 2021-08-07 09:51:14 -06:00
Sandro e056d5d122
Merge pull request #132794 from SuperSandro2000/freeciv
freeciv: format, cleanup
2021-08-07 11:49:14 +02:00
Johannes Arnold ba2cb8365c
ballerburg: init at 1.2.0 (#132824)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-08-07 11:43:20 +02:00
R. RyanTM a4cd1123fe fheroes2: 0.9.5 -> 0.9.6 2021-08-07 07:19:40 +00:00
Artturin 3cf4dbe256 grapejuice: 3.40.14 -> 3.60.14 2021-08-07 04:24:10 +03:00
Sander van der Burg f7ae4163e0 dhewm: add desktop item 2021-08-06 22:14:47 +02:00
Sander van der Burg 55c21071de quakespasm: add desktop item 2021-08-06 22:14:46 +02:00
Sander van der Burg 246ac3167d gzdoom: add desktop item 2021-08-06 22:14:39 +02:00
Naïm Favier da23d345f2
terraria-server: update source URL (#132801)
The old URL redirects to the main page.
2021-08-06 01:54:49 -04:00
Sandro Jäckel da88c1e9b6
freeciv: format, cleanup 2021-08-05 16:57:52 +02:00
oxalica 59538cea82
osu-lazer: remove temper detection bypass patch
See #132610
2021-08-05 15:04:33 +08:00
Sandro 9879c59ab1
Merge pull request #132684 from lukegb/factorio 2021-08-04 22:48:45 +02:00
Luke Granger-Brown f20800263c factorio-experimental: 1.1.36 -> 1.1.37 2021-08-04 16:37:33 +00:00
Sandro b2412ac2e9
Merge pull request #132520 from Stunkymonkey/games-phases 2021-08-03 20:59:54 +00:00
Daniel Olsen 7467b025a0 randtype: init at 1.13 2021-08-03 18:14:09 +02:00
Sandro 8a774cb173
Merge pull request #132512 from McSinyx/flare-1.12
flare: 1.12rc2 -> 1.12
2021-08-03 10:16:14 +00:00
Felix Buehler 11ba397752 flightgear: deprecate phases 2021-08-03 10:50:40 +02:00
Felix Buehler 76fff62cad vapor: deprecate phases 2021-08-03 10:50:22 +02:00
Felix Buehler b2071530e2 sienna: deprecate phases 2021-08-03 10:50:01 +02:00
Felix Buehler 1b7a0e8dbb scrolls: remove phases 2021-08-03 10:49:27 +02:00
Felix Buehler 4dafca2c7a rimshot: remove phases 2021-08-03 10:49:09 +02:00
Felix Buehler 6c9e39afa0 nottetris2: remove phases 2021-08-03 10:48:50 +02:00
Felix Buehler 96dfb5fa71 mrrescue: deprecate phases 2021-08-03 10:48:34 +02:00
Felix Buehler 4911c06d52 mari0: remove phases 2021-08-03 10:48:14 +02:00
Felix Buehler a7d44252c3 dwarf-fortress: remove phases 2021-08-03 10:47:55 +02:00
Felix Buehler 816a29f9c4 duckmarines: deprecate phases 2021-08-03 10:46:05 +02:00
Felix Buehler c77f8555c4 anki: deprecate phases 2021-08-03 10:45:48 +02:00
Felix Buehler d2c084830a 90secondportraits: deprecate phases 2021-08-03 10:45:31 +02:00
Nguyễn Gia Phong b38d8b9960
flare: 1.12rc2 -> 1.12 2021-08-03 14:57:06 +07:00
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