Commit graph

4476 commits

Author SHA1 Message Date
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
Sandro b3186b9860
Merge pull request #122657 from malob/0verkill-darwin-fix
0verkill: fix darwin build
2021-05-12 23:13:12 +02:00
Sandro 88df2cb177
Merge pull request #122765 from legendofmiracles/steam-tui
steam-tui: adds missing runtime dependencies correctly
2021-05-12 22:59:33 +02:00
legendofmiracles 65380bc338
steam-tui: adds missing runtime dependencies 2021-05-12 14:30:50 -06:00
github-actions[bot] b057978bb2
Merge staging-next into staging 2021-05-12 18:32:29 +00:00
Malo Bourgon 9b03a74fb5 0verkill: fix darwin build 2021-05-12 10:01:12 -07:00
Sandro d2d634c6ca
Merge pull request #122699 from legendofmiracles/steam-tui
steam-tui: init at 0.1.0
2021-05-12 17:29:00 +02:00
legendofmiracles 7dd35786f3
steam-tui: init at 0.1.0 2021-05-12 05:53:36 -06:00
github-actions[bot] e2cf474986
Merge staging-next into staging 2021-05-12 06:21:36 +00:00
Peter Hoeg e1ce68683f freeorion: 0.4.9 -> 0.4.10.1 2021-05-12 09:38:58 +08:00
github-actions[bot] 7ce907b413
Merge staging-next into staging 2021-05-10 12:24:36 +00:00
Lancelot SIX e612d0e09a gnuchess: 6.2.7 -> 6.2.8
See https://lists.gnu.org/archive/html/info-gnu/2021-05/msg00006.html
for release information.
2021-05-10 09:24:02 +01:00
Jan Tojnar 594a885912
Merge branch 'staging-next' into staging 2021-05-10 09:45:47 +02:00
yurkobb c8f5ce18fa assaultcube licensing: mark unfree
The license of AssaultCube as a whole is not zlib, it's freeware, see: https://assault.cubers.net/docs/license.html

closes #121381
2021-05-09 19:33:23 +00:00
Dmitry Kalinkin 9d1ff3bf10
Merge pull request #121911 from SFrijters/openttd-1.11.2
openttd: 1.11.1 -> 1.11.2
2021-05-09 00:59:24 -04:00
OPNA2608 b690ceff5d superTuxKart: Fix aarch64-linux build 2021-05-08 13:52:35 -07:00
Jan Tojnar dd78ce1c53
Merge branch 'staging-next' into staging 2021-05-08 20:59:05 +02:00
Charlotte Van Petegem b65155098b zeroad: Add myself as a maintainer 2021-05-08 10:53:49 -07:00
Charlotte Van Petegem 701664ea5c zeroad: Split data from binaries again
The rootdir patch was lost in the update to 0.0.24b. Adding it allows
hydra to build the game. It can't when the binaries depend on the data
since the data is too big for hydra.
2021-05-08 10:53:49 -07:00
Emery Hemingway 37cac60102 alephone: 1.3.1 -> 1.4 2021-05-08 15:28:09 +02:00
R. RyanTM 362edb1962 alephone-infinity: 20200904 -> 20210408 2021-05-08 10:06:10 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Stefan Frijters 282492959e gweled: unstable-2018-02-15 -> unstable-2021-02-11 2021-05-08 00:39:04 -07:00
Daniël de Kok 85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
maralorn 958855d30c
Merge pull request #121627 from NixOS/haskell-updates 2021-05-07 23:55:19 +02:00
Stefan Frijters 62ca25f181 colobot: Fix build 2021-05-07 11:14:40 -07:00
Sandro fdaa6792e5
Merge pull request #121962 from dotlambda/cutemaze-1.3.0
cutemaze: 1.2.6 -> 1.3.0
2021-05-07 16:45:26 +02:00
Malte Brandy 2a11f1f5cc
Merge branch 'master' into haskell-updates 2021-05-07 15:03:54 +02:00
Stefan Frijters af3425beca
openttd: 1.11.1 -> 1.11.2 2021-05-07 12:25:41 +02:00
Eduardo Sánchez Muñoz 5a389e9fd4 minetest: 5.3.0 -> 5.4.1 2021-05-07 00:03:40 -04:00
Robert Schütz a8ac0cfa63 cutemaze: 1.2.6 -> 1.3.0 2021-05-07 00:49:49 +02:00
Maximilian Bosch 730ec2ac89
Merge pull request #121851 from mayflower/hedgewars-ffmpeg4
hedgewars: use ffmpeg 4
2021-05-06 23:07:27 +02:00
Robert Schütz bda9e192dd
Merge pull request #120582 from dotlambda/ffmpeg_2-drop
ffmpeg_2: mark as insecure
2021-05-06 13:51:34 +02:00
Robin Gloster 0bd501d1dd
hedgewars: use ffmpeg 4
see #120705
2021-05-05 16:41:13 -05:00
sternenseemann 977ccbf6bf hedgewars: portability is limited by fpc 2021-05-05 22:45:52 +02:00
Luke Granger-Brown 725468af89 factorio-experimental: 1.1.32 -> 1.1.33 2021-05-04 01:05:21 +00:00
oxalica 935db0c11b
osu-lazer: 2021.410.0 -> 2021.502.0 2021-05-03 15:18:12 +08:00
nixinator d5a0b50f26 methane: init at 2.0.1 2021-05-02 18:12:31 -07:00
Robert Schütz ed42bcb6ff ultrastardx: use ffmpeg_3 instead of ffmpeg_2 2021-05-01 10:08:47 +02:00
V 490fa1e891 steamPackages.steam-runtime: 0.20201203.1 -> 0.20210317.0 2021-04-30 14:38:58 -07:00
Sandro cf467975bf
Merge pull request #120838 from sternenseemann/soldat-unstable-2021-04-27
soldat-unstable: unstable-2021-02-09 -> unstable-2021-04-27
2021-04-30 13:56:50 +02:00
reedrw 4b409860c2
shticker-book-unwritten: fix broken cargoSha256; add libXcursor (#120968) 2021-04-30 04:32:32 +02:00
Sandro Jäckel ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
Sandro 53793fd109
Merge pull request #120976 from r-ryantm/auto-update/cdogs
cdogs-sdl: 0.11.0 -> 0.11.1
2021-04-30 00:56:11 +02:00
R. RyanTM 77a270f871 freeciv: 2.6.3 -> 2.6.4 2021-04-29 00:29:02 -04:00
R. RyanTM f669f72a56 cdogs-sdl: 0.11.0 -> 0.11.1 2021-04-28 04:57:32 +00:00
sternenseemann 712f49a053 soldat-unstable: unstable-2021-02-09 -> unstable-2021-04-27 2021-04-27 16:56:51 +02:00
Robin Townsend 78f77869b9 Revert "minecraft-launcher: 2.2.1441 -> 2.2.741"
This reverts commit dabfce650a, since it
downgraded minecraft-launcher to an older version.
2021-04-26 15:23:42 -04:00
sternenseemann 5f783493a9 soldat-unstable: run hooks for build and install phase 2021-04-25 14:11:16 +02:00
sternenseemann c41d97c324 soldat-unstable: move unstable into version
pname is still soldat, regardless of whether it is stable or unstable,
attribute name should keep the suffix for clarity (soldat stable is
unfree (?) and not packaged by us atm).
2021-04-25 14:11:16 +02:00
sternenseemann f24b888dc2 soldat-unstable: 2020-11-26 -> 2021-02-09 2021-04-25 14:11:16 +02:00
Sandro 2cb1dc3e5b
Merge pull request #120516 from bb2020/gimx
gimx: cleanup
2021-04-25 08:54:54 +02:00
Jonathan Ringer 69a4de6251
steamPackages.steam: use stable archive to avoid 404s 2021-04-24 09:48:44 -07:00
Jonathan Ringer d79d927cca
steamPackages.steam: 1.0.0.69 -> 1.0.0.70 2021-04-24 09:37:38 -07:00
Sandro 6942038dbf
Merge pull request #119979 from Radvendii/mar1d-bump
mar1d: 0.2.0 -> 0.3.0
2021-04-24 08:56:10 +02:00
Stefan Frijters c1c22e065d
openttd-jgrpp: 0.40.5 -> 0.41.0 2021-04-24 00:30:12 +02:00
Stefan Frijters 134fd7fbe4
openttd: 1.11.0 -> 1.11.1 2021-04-24 00:27:21 +02:00
bb2020 b81b6747ea gimx: cleanup 2021-04-23 23:08:54 +03:00
Luke Granger-Brown e25eb0b7a5
Merge pull request #119756 from lukegb/factorio
factorio/factorio-demo: 1.1.30 -> 1.1.32
2021-04-23 20:44:14 +01:00
Ryan Mulligan eb35277c1b
Merge pull request #120232 from IvarWithoutBones/bump/minecraft-launcher
minecraft-launcher: 2.2.1441 -> 2.2.741
2021-04-22 14:03:56 -07:00
Ivar Scholten dabfce650a minecraft-launcher: 2.2.1441 -> 2.2.741 2021-04-22 18:08:17 +02:00
Taeer Bar-Yam f0975780a7 mar1d: 0.2.0 -> 0.3.0 2021-04-21 22:46:05 -04:00
Michael Raskin 8ddbcd14ef
Merge pull request #119763 from marius851000/fgfs
flightgear, simgear: 2020.4.{4,6} -> 2020.4.8
2021-04-21 06:22:28 +00:00
Sandro 981471b0c9
Merge pull request #119890 from fgaz/warzone2100/4.0.1
warzone2100: 4.0.0 -> 4.0.1
2021-04-20 19:07:49 +02:00
marius david dba7df8e4f flightgear: 2020.3.4 -> 2020.3.8 2021-04-20 14:55:56 +02:00
Francesco Gazzetta 93bda27068 warzone2100: 4.0.0 -> 4.0.1 2021-04-19 22:32:03 +02:00
Sandro 213fcedc17
Merge pull request #117287 from xfix/loop-hero-dependencies 2021-04-19 22:03:35 +02:00
Sandro a74823577d
Merge pull request #119886 from OmnipotentEntity/katago-1.8.2
katago: 1.8.1 -> 1.8.2
2021-04-19 21:09:02 +02:00
Sandro 1e78caefb8
Merge pull request #119642 from jojosch/oh-my-git-init 2021-04-19 20:44:34 +02:00
Michael Reilly 72d78d8901 katago: 1.8.1 -> 1.8.2 2021-04-19 13:26:41 -04:00
Johannes Schleifenbaum 0ed5aa8f6a
oh-my-git: init at 0.6.4 2021-04-18 08:33:13 +02:00
Luke Granger-Brown 6a1a3eca9b factorio-demo: 1.1.30 -> 1.1.32 2021-04-17 21:48:09 +00:00
Luke Granger-Brown 9db7133769 factorio: 1.1.30 -> 1.1.32 2021-04-17 21:47:13 +00:00
Sandro d6e1af5d9c
Merge pull request #119604 from selaux/ja2-stracciatella-0.17.0
ja2-stracciatella 0.16.1 -> 0.17.0
2021-04-17 19:36:10 +02:00
Stefan Lau cf8ebdc9c6
ja2-stracciatella 0.16.1 -> 0.17.0 2021-04-17 09:46:51 +02:00
Sandro f93a4f2add
Merge pull request #119456 from oxalica/bump/dotnet-sdk-5-0 2021-04-16 21:40:20 +02:00