Commit graph

4004 commits

Author SHA1 Message Date
Ben Siraphob c602076c8f zdoom: refactor 2021-01-04 16:46:57 +07:00
Samuel Rivas 63faa127df
vassal: 3.3.2 -> 3.14.12
Extra changes:

  - use variables to avoid repetition
  - update licence
  - use fetczip
2021-01-04 08:35:06 +01:00
John Ericson b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 13:22:09 -05:00
github-actions[bot] 0649757570
Merge staging-next into staging 2021-01-03 12:24:59 +00:00
Ben Siraphob 3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Sandro 40e65eb90d
Merge pull request #108143 from fgaz/mindustry/122.1
mindustry: 122 -> 122.1
2021-01-03 10:04:28 +01:00
zowoq fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
github-actions[bot] ec161d2240
Merge master into staging-next 2021-01-02 12:24:09 +00:00
Domen Kožar 77839b5a55
Merge pull request #108062 from siraben/spring-update
spring: refactor
2021-01-02 10:57:12 +00:00
github-actions[bot] 0eb369d907
Merge staging-next into staging 2021-01-01 18:39:12 +00:00
github-actions[bot] c0a9361687
Merge master into staging-next 2021-01-01 18:39:09 +00:00
Francesco Gazzetta 35cbd224af mindustry: 122 -> 122.1 2021-01-01 18:13:55 +01:00
Pavol Rusnak fe1151218c chiaki: cleanup package 2021-01-01 13:33:16 +01:00
github-actions[bot] f1df516121
Merge staging-next into staging 2021-01-01 12:25:55 +00:00
github-actions[bot] 0fe33caad3
Merge master into staging-next 2021-01-01 12:25:52 +00:00
Pavol Rusnak 37c9f30f66
Merge pull request #107983 from Emantor/topic/chiaki_bump_touchpad
chiaki: 1.3.0 -> 2.0.1 & touchpad support
2021-01-01 13:21:17 +01:00
Frederik Rietdijk 3f08495212
Merge pull request #108022 from siraben/cmake-native-build-inputs
[staging] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
2021-01-01 10:54:25 +01:00
Rouven Czerwinski b5a0c7466c chiaki: fix build on darwin
Darwin requires qtmacextra in the buildInputs, otherwise compilation
fails with:

  CMake Error at /nix/store/05nmn6v1hrk56zqs61s2awvykha51fx9-qtbase-5.12.7-dev/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package):
    By not providing "FindQt5MacExtras.cmake" in CMAKE_MODULE_PATH this project
    has asked CMake to find a package configuration file provided by
    "Qt5MacExtras", but CMake did not find one.

    Could not find a package configuration file provided by "Qt5MacExtras" with
    any of the following names:

      Qt5MacExtrasConfig.cmake
      qt5macextras-config.cmake

    Add the installation prefix of "Qt5MacExtras" to CMAKE_PREFIX_PATH or set
    "Qt5MacExtras_DIR" to a directory containing one of the above files.  If
    "Qt5MacExtras" provides a separate development package or SDK, be sure it
    has been installed.
  Call Stack (most recent call first):
    gui/CMakeLists.txt:7 (find_package)

  -- Configuring incomplete, errors occurred!
  See also "/tmp/nix-build-chiaki-2.0.1.drv-0/chiaki/build/CMakeFiles/CMakeOutput.log".
2021-01-01 09:53:27 +01:00
Rouven Czerwinski 4d461177a7 chiaki: add DualShock4 touchpad support
Chiaki supports the touchpad on DualShock4 controllers when they are
connected via USB and requires libevdev & udev for this. Add both
libraries if chiaki is to be built for a Linux host.
2021-01-01 09:52:42 +01:00
github-actions[bot] 8500f595a1
Merge master into staging-next 2021-01-01 06:22:40 +00:00
Ben Siraphob b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Sandro 5ea718cb2d
Merge pull request #106674 from 0x4A6F/master-freenukum 2021-01-01 03:39:00 +01:00
0x4A6F ac47ac9cb7
freenukum: init at 0.3.5 2021-01-01 01:37:12 +00:00
github-actions[bot] 5dffe03f30
Merge master into staging-next 2020-12-31 18:42:41 +00:00
Ben Siraphob d55a9e23b6 spring: refactor 2021-01-01 00:20:18 +07:00
Ben Siraphob 88f3187df3 trackballs: 1.3.1 -> 1.3.2 2020-12-31 19:47:59 +07:00
Frederik Rietdijk e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Niklas Hambüchen a8f2b9f4d9
Merge pull request #67643 from MetaDark/clonehero
clonehero: init at 0.23.2.2
2020-12-31 01:53:46 +01:00
Rouven Czerwinski 536a40c3d7 chiaki: 1.3.0 -> 2.0.1
Also switch the upstream repository from github to git.sr.ht, since the
project has been moved to sourcehut.

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
2020-12-30 21:57:55 +01:00
github-actions[bot] 099a83caba
Merge master into staging-next 2020-12-30 12:24:47 +00:00
Doron Behar f423aea36a
Merge pull request #103077 from freezeboy/add-colobot 2020-12-30 08:42:16 +02:00
github-actions[bot] ff873c7c21
Merge master into staging-next 2020-12-29 18:40:52 +00:00
Sandro 4d8414cb92
Merge pull request #107867 from Atemu/update/anki-bin
anki-bin: 2.1.36 -> 2.1.38
2020-12-29 18:35:11 +01:00
freezeboy 80bff15d7b colobot: init at 0.1.12-alpha
Initial integration without the game musics to reduce the size of the
game. It works without them

Data are in another derivation to let them live their live independently
as they are quite big.

Limited to linux platform only because physfs is currently broken on
darwin.
2020-12-29 13:25:59 +01:00
github-actions[bot] 0984deb2b8
Merge master into staging-next 2020-12-29 06:22:28 +00:00
Sandro ea3638a3fb
Merge pull request #107753 from freezeboy/update-cataclysm-dda
cataclysm-dda: 0.E-2 -> 0.E-3
2020-12-29 05:01:33 +01:00
github-actions[bot] ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Francesco Gazzetta 6792a171e8
mindustry,mindustry-server: 121.4 -> 122 (#107646) 2020-12-28 17:03:31 +01:00
Atemu cc7acd49ba anki-bin: 2.1.36 -> 2.1.38 2020-12-28 15:41:56 +01:00
Frederik Rietdijk 92cc19490e Merge staging into staging-next 2020-12-28 08:45:43 +01:00
freezeboy e8cc6535cc cataclysm-dda: 0.E-2 -> 0.E-3 2020-12-27 21:41:39 +01:00
freezeboy bf629416f0 banner: 1.3.4 -> 1.3.5 2020-12-27 16:12:44 +01:00
Sandro 81181e752a
Merge pull request #106377 from oxalica/osu-lazer 2020-12-26 20:10:50 +01:00
Matt McHenry 13e3d2bc4b openjdk: 14.0.2 -> 15.0.1
* update two explicit references to jdk14 to just jdk, which no longer
  points at jdk8 after #89731.

* patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the
  former now throws an error (after having been deprecated since jdk 9)
2020-12-26 11:58:06 -05:00
github-actions[bot] 309b7614e7
Merge staging-next into staging 2020-12-26 00:47:55 +00:00
Sandro 8dbd5276fe
Merge pull request #103826 from Thra11/augustus-2-0-0 2020-12-25 22:32:04 +01:00
Tom Hall 8992e8d5fc augustus: 1.4.1a -> 2.0.1
Mark as broken on darwin.
2020-12-25 18:47:54 +00:00
oxalica 58e72782e3
osu-lazer: 2020.1204.0 -> 2020.1225.0 2020-12-25 23:06:54 +08:00
oxalica 1f3cbd31b9
osu-lazer: fix runtime error 2020-12-25 23:06:54 +08:00
github-actions[bot] 09a970dcd2
Merge staging-next into staging 2020-12-25 12:23:40 +00:00
Timo Kaufmann 675660e2f3
Merge pull request #106638 from Atemu/anki-bin
anki-bin: init at 2.1.36
2020-12-25 11:41:42 +01:00
github-actions[bot] 8d42e46e8e
Merge staging-next into staging 2020-12-24 12:25:45 +00:00
Jonathan Ringer 9721604610 steamPackages.steam: add udev rules 2020-12-23 22:46:56 -08:00
Atemu 847b317a95 anki-bin: force x11
Co-authored-by: Vika <vika@fireburn.ru>
2020-12-24 07:02:43 +01:00
Atemu 0769fe2712 anki-bin: add darwin support 2020-12-24 07:02:43 +01:00
Atemu 18906f453e anki-bin: init at 2.1.36
Works around https://github.com/NixOS/nixpkgs/issues/78449

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-12-24 07:02:24 +01:00
Frederik Rietdijk 736dd028ca Merge staging-next into staging 2020-12-22 19:43:32 +01:00
Sandro c8e43db4d3
Merge pull request #107245 from lheckemann/manaplus 2020-12-22 16:12:15 +01:00
Linus Heckemann a59c33f33a manaplus: init at 1.9.3.23 2020-12-22 07:06:34 +01:00
github-actions[bot] d87de5dd7d
Merge staging-next into staging 2020-12-21 12:23:08 +00:00
Sandro d8375c5b79
Merge pull request #107290 from fgaz/mindustry/121.4
mindustry,mindustry-server: 120.2 -> 121.4
2020-12-21 07:56:12 +01:00
Jonathan Ringer 373cb5d41d steam: fix readonly boostrap.tar.xz
steam writes it with 444 permissions, which makes
simple deletions fails, and steam will crash
2020-12-20 22:38:18 -08:00
Jonathan Ringer ab91cd998f steam: fix desktop link 2020-12-20 22:38:18 -08:00
Jonathan Ringer 473ec944a1 steamPackages.steam: 1.0.0.61 -> 1.0.0.68 2020-12-20 22:38:18 -08:00
Jonathan Ringer 0179b5f173 steam-fhsenv: normalize ldPath 2020-12-20 22:38:18 -08:00
github-actions[bot] 204a4ef360
Merge staging-next into staging 2020-12-21 00:45:57 +00:00
Sandro e98df3d14a
Merge pull request #105391 from reedrw/r2mod 2020-12-21 00:01:41 +01:00
Francesco Gazzetta 15d67698c0 mindustry,mindustry-server: 120.2 -> 121.4 2020-12-20 23:23:19 +01:00
Milan Pässler a333985d59 libtorrentRasterbar: rename to libtorrent-rasterbar
This is done to match upstream naming:
https://github.com/NixOS/nixpkgs/pull/107194#issuecomment-748501379
2020-12-20 20:51:28 +01:00
github-actions[bot] 266489aefb
Merge staging-next into staging 2020-12-20 18:19:55 +00:00
Sandro 6efd4d4343
Merge pull request #106439 from Xottab-DUTY/patch-2
openxray: update package description
2020-12-20 16:58:08 +01:00
github-actions[bot] fd51d0dfe3
Merge staging-next into staging 2020-12-20 00:44:00 +00:00
Pavol Rusnak 0c3a7f97fd
Merge pull request #107224 from petabyteboy/feature/xonotic-fix-desktop-item
xonotic: fix desktop item
2020-12-19 23:51:38 +01:00
Lluís Batlle i Rossell 7d6cb4e614 frogatto: update to latest master and fix build 2020-12-19 22:00:25 +01:00
Milan Pässler 40262d4559
xonotic: fix desktop item
The desktop item was referring to "$out/bin/xonotic" as executable, but
since it's built in its own derivation now, "$out" did not contain the
xonotic wrapper.
Since it seems to be common practise to use a relative path, I changed
it to do that here as well.
2020-12-19 21:15:20 +01:00
Frederik Rietdijk f081225a83
Merge pull request #106533 from helsinki-systems/refactor/waf-hook
[staging] wafHook: Don't wrap Python 2
2020-12-19 19:28:05 +01:00
Janne Heß c71fd1848b
simutrans: Fix hash 2020-12-17 19:01:32 +01:00
wucke13 2bb504e1f5 flightgear: 2020.1.3 -> 2020.3.4 2020-12-17 10:19:48 -05:00
Jonathan Baldwin 0127c29713 steam/fhsenv: Add LD_LIBRARY_PATH (and hence OpenGL driver library path) to output of --print-steam-runtime-library-paths 2020-12-16 14:04:44 -08:00
Tim Steinbach be4cf62b67
minecraft: Update script URL 2020-12-16 12:53:58 -05:00
Tim Steinbach fc3926ea2d
Revert "minecraft: 2.2.909 → 2.2.741"
This reverts commit 8d4d8ef274.

The update script pulls the version info from AUR and they still use the old version.
Sorry...
2020-12-16 11:31:33 -05:00
Tim Steinbach 8d4d8ef274
minecraft: 2.2.909 → 2.2.741 2020-12-16 10:43:39 -05:00
Milan Pässler df4de2fcc4 superTuxKart: 1.1 -> 1.2 2020-12-14 20:21:47 +01:00
Reed ba5e56f3e6 r2mod_cli: init at 1.0.5 2020-12-14 03:27:17 -05:00
Xottab_DUTY 3414ae7dfc openxray: update package description
To correspond the current project description.
2020-12-12 20:17:37 +03:00
Guillaume Girol 9101c027ae
Merge pull request #105136 from cizra/remove-tdm
tdm: removed
2020-12-11 20:04:00 +00:00
Carles Pagès f1f9a55fb4 minecraft: 2.2.741 -> 2.2.909 2020-12-11 00:50:26 +01:00
Carles Pagès 219301713a
Merge pull request #106065 from bjpbakker/minecraft-fix-java_home
minecraft: fix JAVA_HOME
2020-12-10 23:51:34 +01:00
Martin Weinelt 6a4be92dd8
Merge pull request #106409 from jonringer/fix-steam
steam: fix paradox launchers, and electron apps
2020-12-09 17:08:05 +01:00
R. RyanTM 253de1fcdb alephone-infinity: 20190331 -> 20200904 2020-12-09 15:53:30 +01:00
Emery Hemingway c5f714710c alephone: 20150620 -> 1.3.1 2020-12-09 15:53:29 +01:00
Jonathan Ringer 2831a66be6
steam: share ipc, fix some gui launchers 2020-12-08 18:42:56 -08:00
Jonathan Ringer f162839a1e
steam: fix electron launchers 2020-12-08 18:04:49 -08:00
Jonathan Ringer f3103fe2d1 steamPackages.steam-runtime: 0.20200720.0 → 0.20201203.1 2020-12-08 16:07:51 -08:00
Jonathan Ringer e6bf832880 steamPackages.steam-runtime: add update script, fix pname 2020-12-08 16:07:51 -08:00
ajs124 497afae7e8
sauerbraten: 5492 -> 2020-12-04
http://www.sauerworld.org/new-sauerbraten-2020-edition-released/
2020-12-08 04:51:19 +01:00
Bart Bakker 0451efc553
minecraft: fix JAVA_HOME
JAVA_HOME should point to the root directory of the JRE, not the `bin` folder.
2020-12-06 14:43:09 +01:00
Sandro 87e8335402
Merge pull request #105907 from lukegb/factorio115
factorio-experimental, factorio-headless-experimental: 1.1.4 -> 1.1.5
2020-12-04 22:33:18 +01:00
Luke Granger-Brown ff9d4cc09b factorio-experimental, factorio-headless-experimental: 1.1.4 -> 1.1.5 2020-12-04 19:38:40 +00:00
R. RyanTM b0e8e8365b osu-lazer: 2020.1128.0 -> 2020.1204.0 2020-12-04 19:24:46 +00:00
TredwellGit 814df2946d minecraft: 2.1.17785 -> 2.2.741 2020-12-03 22:50:28 +00:00
Luke Granger-Brown 41742f1139 factorio-experimental, factorio-headless-experimental: 1.1.3 → 1.1.4 2020-12-03 16:55:33 +00:00
Sandro 0278e49268
Merge pull request #105692 from fgaz/mindustry/120.2 2020-12-02 22:04:03 +01:00
Sandro 85fa47d04b
Merge pull request #105649 from r-ryantm/auto-update/freeciv
freeciv: 2.6.2 -> 2.6.2.1
2020-12-02 17:18:03 +01:00
Francesco Gazzetta 298ddbb049 mindustry,mindustry-server: 120 -> 120.2 2020-12-02 13:53:31 +01:00
Francesco Gazzetta 5faf8cbfa5 mindustry,mindustry-server: mark as broken for darwin
There is a hash mismatch when built on darwin:
https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
2020-12-02 13:52:19 +01:00
R. RyanTM 76e79467b2 freeciv: 2.6.2 -> 2.6.2.1 2020-12-02 04:33:17 +00:00
Francesco Gazzetta 48d423ee2a
mindustry,mindustry-server: 104.6 -> 120 (#105590)
* mindustry,mindustry-server: 104.6 -> 120

* mindustry,mindustry-server: remove trailing space
2020-12-01 17:44:51 +01:00
Sandro 5897ce498c
Merge pull request #105542 from r-ryantm/auto-update/osu-lazer
osu-lazer: 2020.1121.0 -> 2020.1128.0
2020-12-01 10:44:12 +01:00
R. RyanTM df4f8c6ddb osu-lazer: 2020.1121.0 -> 2020.1128.0 2020-12-01 04:51:10 +00:00
Luke Granger-Brown f838208033 factorio-experimental, factorio-headless-experimental: 1.1.2 -> 1.1.3 2020-11-30 20:27:23 +01:00
Luke Granger-Brown 8a63eaab52 factorio: add lukegb as maintainer 2020-11-30 18:07:19 +00:00
Luke Granger-Brown 2c8f7755d4 factorio: add an updateScript
The updateScript knows how to automatically fetch and update the version
data from the Factorio versions API (and update the hashes
appropriately), which makes it easier to update whenever experimental
does.
2020-11-30 18:07:16 +00:00
Elmo Todurov 9f196de48d tdm: removed 2020-11-29 23:25:09 +02:00
Frederik Rietdijk db29c15173
Merge pull request #105151 from B4dM4n/copy-desktop-hook
copyDesktopItems: add new setup-hook
2020-11-29 13:26:40 +01:00
Sarah Brofeldt dd59931b57
Merge pull request #104294 from gnidorah/openxray
openxray: replace fix with proper patch
2020-11-29 11:04:58 +01:00
gnidorah f7029d628b openxray: replace fix with proper patch
for glibc 2.32 compatibility
2020-11-29 12:47:58 +03:00
R. RyanTM bf7fa0189d pentobi: 18.3 -> 18.4 2020-11-29 04:43:00 +00:00
Fabian Möller 74088bad64 xonotic: use copyDesktopItems hook 2020-11-29 04:17:12 +01:00
Fabian Möller 81e2df3ce1 minecraft: use copyDesktopItems hook 2020-11-29 04:17:12 +01:00
Mario Rodas ef7d285204
Merge pull request #104561 from r-ryantm/auto-update/nudoku
nudoku: 2.0.0 -> 2.1.0
2020-11-28 16:08:40 -05:00
Tim Steinbach 13ebb30910
minecraft-server: Add test 2020-11-28 12:43:17 -05:00
Tim Steinbach 0dc74a15ad
minecraft: Add test 2020-11-28 12:43:17 -05:00
nyanotech c3f2f8ff1c
factorio-experimental, factorio-headless-experimental: 1.1.1 -> 1.1.2 2020-11-28 14:28:47 +00:00
Reed d595620c38 papermc: 1.16.2r141 -> 1.16.4r296 2020-11-27 18:10:18 -05:00
Sandro 639017c738
Merge pull request #96192 from Artturin/change-multimc
multimc: remove unneeded flag
2020-11-27 22:48:41 +01:00
Sandro ec421ca248
Merge pull request #100532 from piegamesde/fix-desktopitems
treewide: Fix broken desktop files and mark packages as broken
2020-11-27 22:27:59 +01:00
Tim Steinbach 0ce6c50370
minecraft: Skip desktop file validation 2020-11-27 15:43:21 -05:00
Doron Behar 2a84a4981d
Merge pull request #104705 from prusnak/voxelands
voxelands: 1512.00 -> 1704.00
2020-11-27 09:08:20 +02:00
Pavol Rusnak 1ed49e3ea9
voxelands: 1512.00 -> 1704.00 2020-11-26 10:59:32 +01:00
Sandro 56e6adf649
Merge pull request #102263 from Thra11/julius-1-5-1
julius: 1.4.1 -> 1.5.1
2020-11-26 02:33:32 +01:00
Thibault Polge cf1efe2c7e
eduke32: fix version number, use string interpolation for src.url
This fixes mistakes I've introduced in 7798a4e19c.
2020-11-25 21:52:48 +01:00
MetaDark 61b94d7072 clonehero: init at 0.23.2.2 2020-11-25 13:32:53 -05:00
Luke Granger-Brown 6421a1b0ce factorio-experimental, factorio-headless-experimental: 1.1.0 -> 1.1.1 2020-11-25 14:45:57 +01:00
Mario Rodas 252fdbe2e0 nudoku: add platforms 2020-11-25 04:20:00 +00:00
Sandro 9b18fbb931
Merge pull request #104829 from r-ryantm/auto-update/gcompris
gcompris: 0.98 -> 1.0
2020-11-25 02:25:02 +01:00
R. RyanTM 7275a26ed5 gcompris: 0.98 -> 1.0 2020-11-25 00:38:23 +00:00
Pavol Rusnak 2b884eb9f6
Merge pull request #104732 from lukegb/factorio-fail-if-no-creds
factorio: fail fetch early if no credentials provided
2020-11-24 23:33:55 +01:00
Tom Hall c96656d306 julius: 1.4.1 -> 1.5.1
Mark as broken on darwin
2020-11-24 22:29:18 +00:00
Graham Christensen bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Alvar Penning 6f88d6332d openrct2: 0.3.1 -> 0.3.2 2020-11-24 11:26:57 +01:00
Alvar Penning f67c9a36f3 openrct2: 0.3.0 -> 0.3.1 2020-11-24 10:55:18 +01:00
Luke Granger-Brown 0508481dc9 factorio-experimental, factorio-headless-experimental: 1.0.0 -> 1.1.0 2020-11-24 04:05:30 +01:00
Luke Granger-Brown 86aa2a57d3 factorio: fail fetch early if no credentials provided
The download URL will redirect to the login page if credentials are not
present, but will return an error if the credentials are wrong.

Since we know we always expect credentials, we can fail the fetch in
the preHook if they're not provided.

We can't use e.g. builtins.throw because we want the fetchurl derivation
to be evaluated in all cases - because that's the mechanism which allows
you to just manually add the tarball to the Nix store.
2020-11-24 01:32:53 +00:00
Sandro c9a9197078
Merge pull request #102269 from pkern/terraria
terraria-server: 1.4.0.5 -> 1.4.1.2
2020-11-24 00:17:47 +01:00
Jonathan Ringer a748764be4 amoeba: xlibs -> xorg, fix borg 2020-11-23 11:40:23 -08:00
Ryan Mulligan eb8f06106d
Merge pull request #104669 from oxalica/osu-lazer
osu-lazer: 2020.1017.0 -> 2020.1121.0
2020-11-23 11:19:17 -08:00
Jonathan Ringer 97178a01ed amoeba: fix build 2020-11-23 07:01:13 -08:00
Max Wilson e82c3b68e1 steam: http -> https 2020-11-23 06:58:18 -08:00
Maximilian Bosch b11ca24578
EmptyEpsilon: 2020.08.25 -> 2020.11.23
https://github.com/daid/SeriousProton/releases/tag/EE-2020.11.23
2020-11-23 15:55:37 +01:00