Commit graph

4476 commits

Author SHA1 Message Date
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
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
Mustafa Çalışkan 22e0fe2f29
lunar-client: 2.6.0 -> 2.7.3 2021-06-05 21:09:53 +03: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
polygon 388bc58b7f
liquidwar: fix build (#125480)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-03 16:36:26 +02: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
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
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
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
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
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
Karl Meakin 6ee94fc354 runelite: 2.0.0 -> 2.1.5 2021-05-29 16:11:41 -07: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
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
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
Sandro ebd5042606
Merge pull request #124041 from fgaz/shattered-pixel-dungeon/0.9.2b 2021-05-23 17:03:28 +02: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
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
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