Commit graph

4451 commits

Author SHA1 Message Date
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
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
Robert Schütz 0b7ebd1b51 privateer: drop
It was marked as broken in August 2015.
2021-05-18 11:59:54 +02:00
Sandro 32fd19653c
Merge pull request #123468 from Atemu/update/anki-bin
anki-bin: 2.1.43 -> 2.1.44
2021-05-18 11:49:58 +02:00
Profpatsch d7cfce0e47 ultrastardx: 2020.4.0 -> 2021-04-03
Not a lot has changed since last update, a few fixes were pushed to
the master tree.
We take the liberty to update to master for now.

This updates the ffmpeg version from 2.x to 4.x, which seems to be
supported upstream when we bend the minor version restriction a
little.
A simple karaoke song played just fine in my test.
2021-05-18 09:04:32 +02:00
Martin Weinelt 707234bf0d steam: add json-glib to fhsenv
Fixes the Paradox Launcher for Stellaris.

Fixes: #123447
2021-05-17 23:19:33 -07:00
OPNA2608 fc2e0709f0 openxray: 784-october-preview -> 822-december-preview 2021-05-17 20:21:04 -07:00
github-actions[bot] 3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Jonathan Ringer d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro 700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Sandro 65e349506f
Merge pull request #122837 from cyberdront/patch-1
terraria-server: 1.4.1.2 -> 1.4.2.2
2021-05-17 02:27:57 +02:00
Sandro 622c2c2382
Merge pull request #122994 from mweinelt/remove-inactive-maintainer/nand0p
treewide: remove nand0p as maintainer
2021-05-17 02:18:03 +02:00
Sandro b2cd6ba7f5
Merge pull request #123275 from oxalica/osu
osu-lazer: 2021.502.0 -> 2021.515.0
2021-05-17 02:06:17 +02:00
Martin Weinelt 7bd65d54f7 treewide: remove nand0p as maintainer
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.

- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
  maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
Michael Raskin 5e9437ef57
Merge pull request #123289 from OPNA2608/fix/supertuxkart-darwin/21.05
superTuxKart: Build on Darwin
2021-05-16 22:59:10 +00:00
sophrosyne97 1372b429cc cataclysm-dda-git: 2019-11-22 -> 2020-12-09 2021-05-16 15:44:54 -07:00
OPNA2608 f2a29c1ee9 superTuxKart: Make Darwin-compatible 2021-05-16 22:24:34 +02:00
oxalica cf1db5812d
osu-lazer: 2021.502.0 -> 2021.515.0 2021-05-17 02:57:46 +08:00
github-actions[bot] 9911b1c75b
Merge staging-next into staging 2021-05-16 01:01:01 +00:00
Stéphan Kochen 5ed1f1f2a6 frotz: fix darwin build 2021-05-15 14:18:41 +02:00
Marat ad96c7eb13 terraria-server: 1.4.1.2 -> 1.4.2.2 2021-05-14 13:25:29 +04:00
Atemu e2b86ad1e7 anki-bin: 2.1.43 -> 2.1.44 2021-05-13 17:31:54 +02:00
Jan Tojnar 0313c77b55
Merge branch 'staging-next' into staging 2021-05-13 11:42:36 +02:00