3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6472 commits

Author SHA1 Message Date
Artturi 31ebec3e88
Merge pull request #204211 from wackbyte/bump-grapejuice
grapejuice: 6.2.2 -> 7.2.0
2022-12-03 15:18:59 +02:00
Sandro cee75d23a9
Merge pull request #202776 from wegank/springlobby-wxgtk
springLobby: 0.270 -> 0.273
2022-12-03 02:15:51 +01:00
wackbyte 2518d6c080
grapejuice: 6.2.2 -> 7.2.0 2022-12-02 19:48:11 -05:00
Martin Weinelt ebb58e60b8
Merge pull request #196648 from Atemu/init/BeatSaberModManager 2022-12-02 23:29:15 +01:00
Daniel Nagy b2996de2a7
blobby: repair 2022-12-01 16:35:59 +01:00
Weijia Wang 16b756939b springLobby: 0.270 -> 0.273 2022-12-01 12:44:34 +01:00
Naïm Favier b33a7fa3fa
Merge pull request #201568 from ncfavier/df 2022-12-01 11:34:11 +01:00
Daniel Nagy b95d3db40c
mari0: use copyDesktopItems 2022-11-28 14:00:00 +01:00
Sandro 5ffc4c4255
Merge pull request #194469 from nagy/sienna-10d 2022-11-28 00:13:36 +01:00
7c6f434c 7948c710ff
Merge pull request #202929 from wegank/rigsofrods-gtk3
rigsofrods: migrate to wxGTK30-gtk3
2022-11-26 17:37:22 +00:00
Krisztian Szabo a63ffb18cb asc: 2.6.0.0 -> 2.6.3.0
- Fixes build
- Updated to new source repository which users newer libraries
2022-11-26 13:09:32 +01:00
Sergei Trofimovich b259851e21
Merge pull request #202178 from r-ryantm/auto-update/bzflag
bzflag: 2.4.24 -> 2.4.26
2022-11-26 09:01:23 +00:00
Francesco Gazzetta e518978869
Merge pull request #202728 from fgaz/warzone2100/4.3.2
warzone2100: 4.3.1 -> 4.3.2, add nixos test
2022-11-26 08:54:21 +00:00
Weijia Wang a312e52487 rigsofrods: migrate to wxGTK30-gtk3 2022-11-25 23:23:45 +01:00
Aidan Gauland 383ac1066e
starsector: reduce nix profile pollution
Install to $out/share/starsector instead of the top level of $out, in order to
reduce clutter in the user's ~/.nix-profile/ directory.
2022-11-25 21:58:37 +13:00
Francesco Gazzetta cc0182e2d1 nixosTests.warzone2100: init 2022-11-24 20:48:42 +01:00
Francesco Gazzetta 533eaa2781 warzone2100: 4.3.1 -> 4.3.2 2022-11-24 20:48:34 +01:00
Jonas Heinrich 024c337ade
Merge pull request #202414 from jojosch/factorio-update
factorio: 1.1.70 -> 1.1.72
2022-11-24 14:23:14 +01:00
Sandro 2ca694f473
Merge pull request #198552 from wegank/wxgtk-games 2022-11-24 14:21:25 +01:00
R. Ryantm 8f2f7589a5 unciv: 4.2.20 -> 4.3.1 2022-11-23 10:42:58 +00:00
Johannes Schleifenbaum 81f5aad3e4
factorio: 1.1.70 -> 1.1.72 2022-11-22 21:35:31 +01:00
Mario Rodas b29f9c3ae9
Merge pull request #202183 from aaronjheng/harmonist
harmonist: use buildGoModule
2022-11-22 08:41:58 -05:00
Sandro f92cbf4941
Merge pull request #200737 from ursi/hexgui 2022-11-21 21:02:46 +01:00
Sandro 3a05360e53
Merge pull request #200082 from panicgh/fetchgit-sparse-checkout 2022-11-21 20:00:56 +01:00
Aaron Jheng 4f18481878
harmonist: use buildGoModule 2022-11-21 11:34:23 +00:00
R. Ryantm 66b3fa296d bzflag: 2.4.24 -> 2.4.26 2022-11-21 10:49:26 +00:00
Kira Bruneau 55784fbb67
Merge pull request #201860 from muscaln/prismlauncher-fix
prismlauncher: add qtwayland to buildInputs
2022-11-20 16:48:02 -05:00
R. Ryantm ea76cad34d unciv: 4.2.16 -> 4.2.20 2022-11-20 12:20:40 +08:00
Mason Mackaman cb0fc208b6 hexgui: init at unstable-2022-5-30 2022-11-19 15:07:56 -05:00
Ryan Burns 2e065b0073
Merge pull request #181422 from necauqua/starsector-fixes
starsector: fix jvm compatibility, startup crashes and sound, add passthru.updateScript
2022-11-19 00:11:08 -08:00
Mustafa Çalışkan 679b5bde4e
prismlauncher: add qtwayland to buildInputs 2022-11-19 09:35:45 +03:00
Wanja Hentze de4bf04522
terraria-server: 1.4.4.8.1 -> 1.4.4.9 2022-11-18 21:27:28 +01:00
Francesco Gazzetta d9b668110b
Merge pull request #200743 from chkno/mindustry-140.3
mindustry: 126.2 → 140.4
2022-11-18 10:07:43 +00:00
Naïm Favier 34e0667b74
dwarf-fortress.dfhack: use CXXFLAGS instead of NIX_CFLAGS_COMPILE
See https://github.com/NixOS/nixpkgs/issues/79303.

Avoids warnings about -fpermissive not being a valid C flag.
2022-11-18 10:29:41 +01:00
Scott Worley 138be4cfbb mindustry: More uniform source cleanup 2022-11-17 17:16:05 -08:00
Scott Worley 3cd3cbd2d3 mindustry: 126.2 → 140.4 2022-11-17 17:16:02 -08:00
R. Ryantm c0d9e956e6 ckan: 1.31.0 -> 1.31.2 2022-11-17 20:13:04 +08:00
Bobby Rong 9c478777aa
Merge pull request #201350 from Minion3665/prismlauncher-5.2
prismlauncher: 5.1 -> 5.2
2022-11-17 20:03:03 +08:00
Naïm Favier a515239b52
dwarf-fortress,dwarf-fortress.dfhack: add ncfavier as maintainer 2022-11-17 09:50:53 +01:00
Naïm Favier ab693c7592
dwarf-fortress.dfhack: drop broken versions
These versions don't build because their submodules use `git://` URLs,
which are no longer supported by GitHub.

I don't think there's a reasonable way to work around that since
`fetchgit` doesn't allow patching the source *before* fetching
submodules.
2022-11-17 09:50:53 +01:00
Naïm Favier e786b3ec21
dwarf-fortress.dfhack: updates and fixes
Updates the release number for the latest two DF versions, and fixes some
older ones.

Notable change from 0.47.05-r7: dfhack.init was moved into
dfhack-config/init.

https://github.com/DFHack/dfhack/releases/tag/0.47.05-r7

https://github.com/DFHack/dfhack/releases/tag/0.47.04-r5
2022-11-17 09:50:52 +01:00
Naïm Favier cff44486bc
dwarf-fortress: add settings
Adds a `settings` argument to the wrapper allowing to override settings
in `data/init/*.txt`.
2022-11-17 09:50:52 +01:00
R. Ryantm 7b70b81224 ferium: 4.2.1 -> 4.2.2 2022-11-17 09:56:35 +08:00
Martin Weinelt 8f4ba4a209
Merge pull request #201478 from ncfavier/dwarf-therapist-x86 2022-11-17 02:10:36 +01:00
Naïm Favier 839fdd101c
dwarf-fortress.dfhack: make overridable
Currently, it is quite hard to override anything about dfhack (for
example, to add plugins at build time), because

1. it is not exposed anywhere, so you have to do something like
   `dwarf-fortress.override (oldArgs: { dfhack = oldArgs.dfhack.override...; })`
2. the final `dfhack` derivation is a `buildEnv`, so `overrideAttrs`
   doesn't work as expected.

This fixes 1 by adding `dfhack` to the wrapper's `passthru`, and 2 by
moving `twbt.lib` (which is the only reason for the dfhack `buildEnv`)
into the wrapper.

Also adds an `extraPackages` argument to the wrapper, and copies `*.init`
files from the env to the DF directory so that we can easily add a
`dfhack.init`.

With these changes, I was able to build dfhack with the dfplex plugin.
2022-11-17 00:06:31 +01:00
Naïm Favier 22b96bfb35
dwarf-therapist: pass through meta 2022-11-16 12:21:34 +01:00
Jonas Heinrich 8b713a9958 keeperrl: alpha28 -> alpha34 2022-11-16 12:19:40 +01:00
Naïm Favier 67aacbb937
dwarf-therapist: restrict platforms to x86
Avoid trying to build for aarch64 on Hydra. Dwarf Fortress only runs on x86.
2022-11-16 11:59:39 +01:00
Wanja Hentze d145c5222b
terraria-server: 1.4.4.2 -> 1.4.4.8.1 2022-11-15 22:39:29 +01:00
Nicolas Benes c95d7d5a8c treewide: make sparseCheckout a list of strings 2022-11-15 19:46:12 +01:00