1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 18:12:46 +00:00
Commit graph

3672 commits

Author SHA1 Message Date
Mario Rodas 7c7ee58775
Merge pull request #98229 from bbigras/df
dwarf-fortress: update themes.json
2020-09-20 19:42:18 -05:00
Gabriel Ebner 6eab2acc6a multimc: use jdk8 2020-09-19 17:43:00 +02:00
Gabriel Ebner 6784e7ec75 steam: use jdk8 2020-09-19 15:29:19 +02:00
Gabriel Ebner cdcdeb63b2 dwarf-fortress: use jdk8 2020-09-19 14:06:15 +02:00
Bruno Bigras 5427e43b08 dwarf-fortress: update themes.json 2020-09-18 13:44:06 -04:00
aszlig 948d828955
uqm: Fix purity checking error during config phase
Since commit fb777be7d2, linking programs
in /tmp will no longer work, since with this commit (hardcoded) /tmp
will no longer be treated a valid temporary directory by the purity
checking logic.

Essentially what that logic does is checking whether the link target is
either relative, in some temporary directory or in the Nix store and if
that's not the case, an error is thrown like in this case:

  gcc -c /tmp/build.24.tmp.c -o /tmp/build.24.tmp.c.o
  gcc /tmp/build.24.tmp.c.o -o /tmp/build.24.tmp.out
  impure path `/tmp/build.24.tmp.out' used in link
  collect2: error: ld returned 1 exit status

Note here, that $TMP and $TMPDIR point to /build while the output here
still refers to /tmp. This is because the custom build system of uqm
simply hardcodes /tmp and doesn't honor any of these variables.

To fix this, all we need to do is the latter and we're now using $TMPDIR
instead of /tmp for these compile-tests during configure.

While the pull request[1] introducing said commit has a few comments
regarding other issues and it could still be either reverted or changed,
using $TMPDIR in the uqm build script is entirely backwards-compatible
and shouldn't hurt in any case.

[1]: https://github.com/NixOS/nixpkgs/pull/93560

Signed-off-by: aszlig <aszlig@nix.build>
2020-09-18 12:33:03 +02:00
Lassulus 1c4113e359
Merge pull request #97099 from r-ryantm/auto-update/crawl
crawl: 0.25.0 -> 0.25.1
2020-09-17 20:53:08 +02:00
Mathnerd314 47ba35d6d4
unnethack: 5.2.0 -> 5.3.2 (#97595)
Co-authored-by: Jon <jonringer@users.noreply.github.com>
2020-09-14 20:48:49 -07:00
Matthew Bauer a4ad9e740a
Merge pull request #97507 from jonascarpay/gambatte-alsa-fix
gambatte: add alsa dependency, 2016-05-03 -> 2020-03-14
2020-09-14 21:44:19 -05:00
Silvan Mosberger 3558be46b0
Merge pull request #97674 from Avaq/avaq/minecraft-server
minecraft-server: 1.16.2 -> 1.16.3
2020-09-12 18:44:43 +02:00
Jan Tojnar 607509ac8f
Merge pull request #97690 from jtojnar/inkscape-1.0.1 2020-09-12 16:30:53 +02:00
Daniel Fullmer b3de09bc52
steam: fix typo in LD_LIBRARY_PATH (#97818) 2020-09-11 23:19:31 -04:00
Lassulus 5cd42271a3
Merge pull request #97452 from Lassulus/zandronum-fix
zandronum: use new hg url
2020-09-10 22:57:00 +02:00
Lassulus ee16664c28
Merge pull request #66641 from 0x4A6F/master-wyvern
wyvern: init at 1.4.1
2020-09-10 22:40:02 +02:00
0x4A6F 2e69b42a81
wyvern: init at 1.4.1 2020-09-10 19:27:00 +00:00
Jan Tojnar 35deaa45a1
inkscape_0: drop
Inkscape 1.0.1 re-added the old CLI flags:
3ca6a4ed08
2020-09-10 20:46:55 +02:00
Aldwin Vlasblom 0d8400aa82
minecraft-server: 1.16.2 -> 1.16.3 2020-09-10 17:39:34 +02:00
marius david 43d9d1d7d8 instead: 3.3.1 -> 3.3.2; fix compilation 2020-09-09 10:36:06 -07:00
Jonas Carpay 9db2ca30ac gambatte: add alsa dependency, 2016-05-03 -> 2020-03-14 2020-09-09 15:28:24 +09:00
lassulus e9c4e3ffb4 zandronum: use new hg url 2020-09-08 16:26:41 +02:00
Renato Alves 068400bdfc
tdm: 2.07 -> 2.08 2020-09-06 20:31:59 +02:00
Ryan Mulligan b25c6a293e
Merge pull request #97224 from r-ryantm/auto-update/osu-lazer
osu-lazer: 2020.820.0 -> 2020.903.0
2020-09-05 13:03:27 -07:00
Ryan Mulligan e782f6151d
Merge pull request #97096 from r-ryantm/auto-update/cockatrice
cockatrice: 2020-03-20-Release-2.7.4 -> 2020-08-23-Release-2.7.5
2020-09-05 13:00:54 -07:00
R. RyanTM 0555dc1c23 shattered-pixel-dungeon: 0.8.2b -> 0.8.2d 2020-09-05 18:03:57 +00:00
R. RyanTM 2e91a108d0 osu-lazer: 2020.820.0 -> 2020.903.0 2020-09-05 13:08:02 +00:00
Jan Tojnar 5079e1cd3b
Merge pull request #96939 from jtojnar/drop-gst-010 2020-09-04 17:13:43 +02:00
R. RyanTM bc134692c5 crawl: 0.25.0 -> 0.25.1 2020-09-04 09:41:46 +00:00
R. RyanTM c534410847 cockatrice: 2020-03-20-Release-2.7.4 -> 2020-08-23-Release-2.7.5 2020-09-04 08:59:50 +00:00
Timo Kaufmann 8003bb3cda hedgewars: enable build on hydra
Was disabled when the package was marked as broken in
c333861954. It has since been un-broken,
but the hydraPlatforms exception was left presumably by mistake.
2020-09-04 10:53:46 +02:00
Timo Kaufmann baf51e4600 hedgewars: fix build on aarch64
Possible now that fpc works on aarch64. For some reason hedgewars
requires llvm when building on that platform.
2020-09-03 18:44:40 +02:00
Timo Kaufmann c25a7cd846
Merge pull request #97006 from timokau/fpc-3.2.0-aarch64
fpc: 3.0.4 -> 3.2.0, add support for aarch64-linux
2020-09-03 18:44:17 +02:00
Timo Kaufmann f928b91f34 fpc: 3.0.4 -> 3.2.0
There was no 3.1 for some reason. The old sed-based path patching was
broken and resulted in syntax errors since it was a bit over-eager.
Instead of fixing it, I decided to replace it with a patch file which is
easier to inspect and will fail in a more obvious way next time.

The patch is now applied unconditionally, since it actually applies to
all linux platforms. The changes are localized to linux-specific code,
so it does not hurt to apply it on non-linux platforms as well.

Hedgewars needs a small fix to work with the new version. Done in the
same commit to avoid a broken commit.
2020-09-03 14:52:18 +02:00
Timo Kaufmann 596de92ca7 ultrastardx: unstable-2019-01-07 -> 2020.4.0
Might as well update it while I fix it up for the fpc update.
2020-09-03 14:39:11 +02:00
Janne Heß df58a632ca
left4gore: Init at 2.3 2020-09-02 22:15:08 +02:00
Jan Tojnar 5a1a7d3dcc
steam-run: remove ancient gstreamer dependency
It is insecure and broken.

Follow https://github.com/NixOS/nixpkgs/pull/93398
2020-09-02 02:23:54 +02:00
R. RyanTM 1f79f65521 vassal: 3.2.17 -> 3.3.2 2020-08-31 16:53:23 +02:00
Peter Hoeg 250735e07e
Merge pull request #96650 from peterhoeg/u/gemrb_0_8_7
gemrb: 0.8.6 -> 0.8.7
2020-08-30 12:12:45 +08:00
Peter Hoeg bf03e96426 gemrb: 0.8.6 -> 0.8.7 2020-08-30 11:45:31 +08:00
Frederik Rietdijk 7b56d26ae3 Merge master into staging-next 2020-08-29 13:30:25 +02:00
Michele Guerini Rocco a8b95d8b00
Merge pull request #96384 from OmnipotentEntity/katago-1.6.1
katago: 1.6.0 -> 1.6.1
2020-08-28 23:45:34 +02:00
Michael Reilly 12c0b4ac58 katago: 1.6.0 -> 1.6.1 2020-08-28 13:48:49 -04:00
Lassulus ee80c91555
Merge pull request #89364 from patrl/update-exult
exult: 1.4.9rc1 -> 1.6
2020-08-28 11:32:59 +02:00
Patrick Elliott c8ef002830
Update to 1.6
remove patch

Use variable

removed date signature
2020-08-27 17:30:23 -04:00
Frederik Rietdijk 13d93aabfb Merge staging-next into staging 2020-08-27 08:37:03 +02:00
davidak a1301886c1
klavaro: add link to changelog
this makes review easier
2020-08-26 15:37:04 +02:00
R. RyanTM 8c5443be51 klavaro: 3.10 -> 3.11 2020-08-26 06:50:00 +00:00
Daniël de Kok ee40d9e480
Merge pull request #96277 from danieldk/papermc-cleanup
papermc: cleanup
2020-08-26 06:52:21 +02:00
Lassulus 8396051289
Merge pull request #79024 from helsinki-systems/xcowsay-init
xcowsay: Init at 1.5
2020-08-26 00:03:40 +02:00
Michele Guerini Rocco 8c48e5007e
Merge pull request #96121 from OmnipotentEntity/katago-1.6.0
katago: 1.5.0 -> 1.6.0
2020-08-25 23:24:35 +02:00
Janne Heß 3acc2a638a
xcowsay: Init at 1.4 2020-08-25 22:08:39 +02:00